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..5afadba2c --- /dev/null +++ b/.github/workflows/build.yaml @@ -0,0 +1,6546 @@ +name: build +'on': + schedule: + - + cron: '0 0 * * 2' + push: null + pull_request: + branches: + - master + workflow_dispatch: null +jobs: + validate-automation: + name: 'Validate Automation' + runs-on: ubuntu-latest + steps: + - + uses: actions/checkout@v6 + - + 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: + 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() && !cancelled() }}' + 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/apache/alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/base-app/alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/base-app/ubuntu-22.04 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/base/alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/base/ubuntu-22.04 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/bootstrap/alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/bootstrap/ubuntu-22.04 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + name: 'run structure-test' + run: |- + cd tests/structure-test + /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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/dockerfile-build-env/latest + platforms: '${{ matrix.platform }}' + load: true + 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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/nginx/alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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-dev/8.1 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' + php-apache-dev_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-apache-dev:8.1-alpine (${{ matrix.arch }})' + needs: php-apache_8-1-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-dev/8.1-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-dev/8.2 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' + php-apache-dev_8-2-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-apache-dev:8.2-alpine (${{ matrix.arch }})' + needs: php-apache_8-2-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-dev/8.2-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-dev/8.3 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' + php-apache-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-apache-dev:8.3-alpine (${{ matrix.arch }})' + needs: php-apache_8-3-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-dev/8.3-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-dev/8.4 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' + php-apache-dev_8-4-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-apache-dev:8.4-alpine (${{ matrix.arch }})' + needs: php-apache_8-4-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-dev/8.4-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-dev/8.5 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' + php-apache-dev_8-5-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-apache-dev:8.5-alpine (${{ matrix.arch }})' + needs: php-apache_8-5-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-dev/8.5-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.1 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.1' + php-apache_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-apache:8.1-alpine (${{ matrix.arch }})' + needs: php_8-1-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.1-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.2 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.2' + php-apache_8-2-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-apache:8.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.2-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.3 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.3' + php-apache_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-apache:8.3-alpine (${{ matrix.arch }})' + needs: php_8-3-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.3-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.3-alpine' + php-apache_8-3-alpine_publish: + name: 'webdevops/php-apache:8.3-alpine - Publish' + runs-on: ubuntu-latest + needs: php-apache_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 }}' + - + 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-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 + - + 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-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() && !cancelled() }}' + 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 + 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: + 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() && !cancelled() }}' + 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-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.5 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.5' + php-apache_8-5-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-apache:8.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.5-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.1 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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' + php-dev_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-dev:8.1-alpine (${{ matrix.arch }})' + needs: php_8-1-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.1-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.2 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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' + php-dev_8-2-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.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.2-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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 + needs: php-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: + 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.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() && !cancelled() }}' + 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.3 + platforms: '${{ matrix.platform }}' + load: true + 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 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 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV90ZXN0In0= 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.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 }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + 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() && !cancelled() }}' + 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.3-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfdGVzdCJ9 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.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 }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + 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 }}' + - + 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() && !cancelled() }}' + 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 + 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: + 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() && !cancelled() }}' + 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-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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.5 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.5 --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.5' + php-dev_8-5-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.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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.5-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx-dev/8.1 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.1' + php-nginx-dev_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-dev:8.1-alpine (${{ matrix.arch }})' + needs: php-nginx_8-1-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx-dev/8.1-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx-dev/8.2 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' + php-nginx-dev_8-2-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-dev:8.2-alpine (${{ matrix.arch }})' + needs: php-nginx_8-2-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx-dev/8.2-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx-dev/8.3 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' + php-nginx-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-nginx-dev:8.3-alpine (${{ matrix.arch }})' + needs: php-nginx_8-3-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx-dev/8.3-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx-dev/8.4 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' + php-nginx-dev_8-4-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-dev:8.4-alpine (${{ matrix.arch }})' + needs: php-nginx_8-4-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx-dev/8.4-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx-dev/8.5 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-nginx-dev:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' + php-nginx-dev_8-5-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-dev:8.5-alpine (${{ matrix.arch }})' + needs: php-nginx_8-5-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx-dev/8.5-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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-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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx/8.1 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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 --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 }}' + - + 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' + 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() && !cancelled() }}' + 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-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: '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-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 + needs: php-nginx_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: '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-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: + - + 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-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: + 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() && !cancelled() }}' + 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-nginx/8.2 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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' + php-nginx_8-2-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.2-alpine (${{ matrix.arch }})' + needs: php_8-2-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx/8.2-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx/8.3 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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' + php-nginx_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-nginx:8.3-alpine (${{ matrix.arch }})' + needs: php_8-3-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx/8.3-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx/8.4 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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' + php-nginx_8-4-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.4-alpine (${{ matrix.arch }})' + needs: php_8-4-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx/8.4-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-nginx/8.5 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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' + php-nginx_8-5-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.5-alpine (${{ matrix.arch }})' + needs: php_8-5-alpine_publish + if: '${{ !failure() && !cancelled() }}' + 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-nginx/8.5-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-official/8.1 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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 --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' + php_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:8.1-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() && !cancelled() }}' + 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-official/8.1-alpine + platforms: '${{ matrix.platform }}' + load: true + 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: '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-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: + - + 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: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: + 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() && !cancelled() }}' + 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-official/8.2 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.2' + php_8-2-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:8.2-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() && !cancelled() }}' + 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-official/8.2-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-official/8.3 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.3' + php_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:8.3-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() && !cancelled() }}' + 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-official/8.3-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-official/8.4 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.4' + php_8-4-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:8.4-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() && !cancelled() }}' + 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-official/8.4-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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-official/8.5 + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + name: 'Push arch image' + if: "${{github.ref == 'refs/heads/master'}}" + run: 'docker push "ghcr.io/webdevops/php:sha-${{ github.sha }}-${{ matrix.arch }}"-8.5' + php_8-5-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:8.5-alpine (${{ matrix.arch }})' + needs: toolbox_latest_publish + if: '${{ !failure() && !cancelled() }}' + 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-official/8.5-alpine + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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.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 }}' + - + 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 }}' + - + 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: + 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: + 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() && !cancelled() }}' + 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/storage/latest + platforms: '${{ matrix.platform }}' + load: true + 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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/toolbox/latest + platforms: '${{ matrix.platform }}' + load: true + 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' + 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/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 }}' + - + 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: + 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() && !cancelled() }}' + 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/vsftp/latest + platforms: '${{ matrix.platform }}' + load: true + 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 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 + - + 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/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 }}' + - + 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/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 1e6634b4d..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,1985 +0,0 @@ -stages: - - level1 - - level2 - - level3 - - level4 - - level5 - - level6 - - level7 -'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 - variables: - DOCKER_BUILDKIT: '1' - 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/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 - variables: - DOCKER_BUILDKIT: '1' - 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: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/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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDJlYmY4LjIzODc5ODMxIn0= Dockerfile_62ae1ba202ebf8.23879831' - - '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/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_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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/certbot_spec.rb webdevops/certbot:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2NlcnRib3Q6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjEiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAyZjJjMi4wNDU5ODcxNSJ9 Dockerfile_62ae1ba202f2c2.04598715' - - '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': - 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/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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAyZjk3Mi42NDg1MTM2MCJ9 Dockerfile_62ae1ba202f972.64851360' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba202fcf0.63058592' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba202fcf0.63058592' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMmZjZjAuNjMwNTg1OTIifQ== Dockerfile_62ae1ba202fcf0.63058592' - - '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_62ae1ba2030118.72612316' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2030118.72612316' - - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMzAxMTguNzI2MTIzMTYifQ== Dockerfile_62ae1ba2030118.72612316' - - '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/nginx-dev:alpine': - 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/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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx-dev_spec.rb webdevops/nginx-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54LWRldjphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDMwNDc3LjA1MjM2OTI3In0= Dockerfile_62ae1ba2030477.05236927' - - '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_62ae1ba20307d1.50121791' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20307d1.50121791' - - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDMwN2QxLjUwMTIxNzkxIn0= Dockerfile_62ae1ba20307d1.50121791' - - '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/apache-dev:alpine': - 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/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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/apache-dev_spec.rb webdevops/apache-dev:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZS1kZXY6YWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzMGJmNC4xNTU5NzY2OSJ9 Dockerfile_62ae1ba2030bf4.15597669' - - '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' - tags: - - aws - needs: - - 'webdevops/apache:alpine' -'webdevops/varnish: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/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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/varnish_spec.rb webdevops/varnish:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Zhcm5pc2g6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzMGY2NS4yOTEwODU0MiJ9 Dockerfile_62ae1ba2030f65.29108542' - - 'docker push webdevops/varnish:latest' - - 'docker tag webdevops/varnish:latest $CI_REGISTRY_IMAGE/varnish:latest' - - 'docker push $CI_REGISTRY_IMAGE/varnish:latest' - tags: - - aws - needs: - - 'webdevops/base:alpine' -'webdevops/bootstrap:ubuntu-20.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 - variables: - DOCKER_BUILDKIT: '1' - script: - - '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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMSIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNDU1My41MzgxMjE1NiJ9 Dockerfile_62ae1ba2034553.53812156' - - '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' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/base:ubuntu-20.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 - variables: - DOCKER_BUILDKIT: '1' - script: - - '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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIwLjA0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIwLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMzQ4ZDcuNDE5MTU5NTEifQ== Dockerfile_62ae1ba20348d7.41915951' - - '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' - tags: - - aws - needs: - - 'webdevops/bootstrap:ubuntu-20.04' -'webdevops/base-app:ubuntu-20.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 - 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_62ae1ba2034c65.77584306' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2034c65.77584306' - - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMC4wNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6InVidW50dS0yMC4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDM0YzY1Ljc3NTg0MzA2In0= Dockerfile_62ae1ba2034c65.77584306' - - '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_62ae1ba2034ff4.84111125' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2034ff4.84111125' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNGZmNC44NDExMTEyNSJ9 Dockerfile_62ae1ba2034ff4.84111125' - - '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 $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:ubuntu-20.04" >> Dockerfile_62ae1ba2035394.75228567' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2035394.75228567' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:ubuntu-20.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDp1YnVudHUtMjAuMDQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjAuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNTM5NC43NTIyODU2NyJ9 Dockerfile_62ae1ba2035394.75228567' - - '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_62ae1ba20357c2.10169417' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20357c2.10169417' - - 'bundle install' - - 'bash serverspec.sh spec/docker/mail-sandbox_spec.rb webdevops/mail-sandbox:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL21haWwtc2FuZGJveDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNTdjMi4xMDE2OTQxNyJ9 Dockerfile_62ae1ba20357c2.10169417' - - '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_62ae1ba2035e67.65319168' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2035e67.65319168' - - 'bundle install' - - 'bash serverspec.sh spec/docker/ssh_spec.rb webdevops/ssh:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3NzaDpsYXRlc3QiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjAuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjAzNWU2Ny42NTMxOTE2OCJ9 Dockerfile_62ae1ba2035e67.65319168' - - '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-20.04' -'webdevops/postfix: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/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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/postfix_spec.rb webdevops/postfix:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3Bvc3RmaXg6bGF0ZXN0IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoibGF0ZXN0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIwLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwMzYxZDYuMDY3MDk4MjUifQ== Dockerfile_62ae1ba20361d6.06709825' - - 'docker push webdevops/postfix:latest' - - 'docker tag webdevops/postfix:latest $CI_REGISTRY_IMAGE/postfix:latest' - - 'docker push $CI_REGISTRY_IMAGE/postfix:latest' - tags: - - aws - needs: - - 'webdevops/base-app:ubuntu-20.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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2036547.17992910' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2036547.17992910' - - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6ImxhdGVzdCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMC4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDM2NTQ3LjE3OTkyOTEwIn0= Dockerfile_62ae1ba2036547.17992910' - - '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-20.04' -'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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2044e90.36554726' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2044e90.36554726' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNDRlOTAuMzY1NTQ3MjYifQ== Dockerfile_62ae1ba2044e90.36554726' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2045252.18152996' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2045252.18152996' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ1MjUyLjE4MTUyOTk2In0= Dockerfile_62ae1ba2045252.18152996' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba20455b3.99571255' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20455b3.99571255' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0NTViMy45OTU3MTI1NSJ9 Dockerfile_62ae1ba20455b3.99571255' - - '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: - - 'docker 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_62ae1ba2045928.06893180' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2045928.06893180' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNDU5MjguMDY4OTMxODAifQ== Dockerfile_62ae1ba2045928.06893180' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2045cb3.93553676' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2045cb3.93553676' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ1Y2IzLjkzNTUzNjc2In0= Dockerfile_62ae1ba2045cb3.93553676' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2046027.70997251' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2046027.70997251' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ2MDI3LjcwOTk3MjUxIn0= Dockerfile_62ae1ba2046027.70997251' - - '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: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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2048db3.48660323' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2048db3.48660323' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ4ZGIzLjQ4NjYwMzIzIn0= Dockerfile_62ae1ba2048db3.48660323' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2049144.06257099' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049144.06257099' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0OTE0NC4wNjI1NzA5OSJ9 Dockerfile_62ae1ba2049144.06257099' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:7.4-alpine" >> Dockerfile_62ae1ba2049538.05686224' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049538.05686224' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNDk1MzguMDU2ODYyMjQifQ== Dockerfile_62ae1ba2049538.05686224' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba20498a2.34874878' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20498a2.34874878' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40LWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDQ5OGEyLjM0ODc0ODc4In0= Dockerfile_62ae1ba20498a2.34874878' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:7.4-alpine" >> Dockerfile_62ae1ba2049c74.86686736' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049c74.86686736' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0OWM3NC44NjY4NjczNiJ9 Dockerfile_62ae1ba2049c74.86686736' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2049fc7.62230106' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2049fc7.62230106' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40LWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0OWZjNy42MjIzMDEwNiJ9 Dockerfile_62ae1ba2049fc7.62230106' - - '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: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: - - 'docker 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:7.4" >> Dockerfile_62ae1ba204ceb8.53467647' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204ceb8.53467647' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGNlYjguNTM0Njc2NDcifQ== Dockerfile_62ae1ba204ceb8.53467647' - - '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' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba204d221.35465026' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204d221.35465026' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRkMjIxLjM1NDY1MDI2In0= Dockerfile_62ae1ba204d221.35465026' - - '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 - variables: - DOCKER_BUILDKIT: '1' - script: - - '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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjcuNCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjcuNCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZDU3OS4wMDE0MDEyOCJ9 Dockerfile_62ae1ba204d579.00140128' - - '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-apache:7.4' -'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 - variables: - DOCKER_BUILDKIT: '1' - script: - - '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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo3LjQiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI3LjQiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGQ4YzQuMzkzMTM4NjYifQ== Dockerfile_62ae1ba204d8c4.39313866' - - '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: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 - variables: - DOCKER_BUILDKIT: '1' - script: - - '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' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRkYzQzLjYzODgwNjk1In0= Dockerfile_62ae1ba204dc43.63880695' - - '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-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: - - 'docker 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:7.4" >> Dockerfile_62ae1ba204e295.59673830' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204e295.59673830' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:7.4 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6Ny40IiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiNy40IiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRlMjk1LjU5NjczODMwIn0= Dockerfile_62ae1ba204e295.59673830' - - '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' - tags: - - aws - needs: - - 'webdevops/php:7.4' -'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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba204e602.52166074' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204e602.52166074' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRlNjAyLjUyMTY2MDc0In0= Dockerfile_62ae1ba204e602.52166074' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba204e982.01159543' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204e982.01159543' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZTk4Mi4wMTE1OTU0MyJ9 Dockerfile_62ae1ba204e982.01159543' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_62ae1ba204ed79.23028654' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204ed79.23028654' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNGVkNzkuMjMwMjg2NTQifQ== Dockerfile_62ae1ba204ed79.23028654' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba204f130.99828471' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204f130.99828471' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDRmMTMwLjk5ODI4NDcxIn0= Dockerfile_62ae1ba204f130.99828471' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_62ae1ba204f560.58381463' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204f560.58381463' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZjU2MC41ODM4MTQ2MyJ9 Dockerfile_62ae1ba204f560.58381463' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba204f8b7.27167310' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba204f8b7.27167310' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA0ZjhiNy4yNzE2NzMxMCJ9 Dockerfile_62ae1ba204f8b7.27167310' - - '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: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: - - 'docker 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_62ae1ba2056be9.98212910' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2056be9.98212910' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDU2YmU5Ljk4MjEyOTEwIn0= Dockerfile_62ae1ba2056be9.98212910' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2057639.53737843' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2057639.53737843' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1NzYzOS41MzczNzg0MyJ9 Dockerfile_62ae1ba2057639.53737843' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_62ae1ba2057ac2.33432049' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2057ac2.33432049' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNTdhYzIuMzM0MzIwNDkifQ== Dockerfile_62ae1ba2057ac2.33432049' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2057e26.35380534' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2057e26.35380534' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDU3ZTI2LjM1MzgwNTM0In0= Dockerfile_62ae1ba2057e26.35380534' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_62ae1ba2058542.23710867' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2058542.23710867' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1ODU0Mi4yMzcxMDg2NyJ9 Dockerfile_62ae1ba2058542.23710867' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2058cd7.85159463' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2058cd7.85159463' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1OGNkNy44NTE1OTQ2MyJ9 Dockerfile_62ae1ba2058cd7.85159463' - - '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: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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba20593b8.74182068' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20593b8.74182068' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNTkzYjguNzQxODIwNjgifQ== Dockerfile_62ae1ba20593b8.74182068' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2059ce9.25662698' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2059ce9.25662698' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDU5Y2U5LjI1NjYyNjk4In0= Dockerfile_62ae1ba2059ce9.25662698' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205a225.24207095' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205a225.24207095' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1YTIyNS4yNDIwNzA5NSJ9 Dockerfile_62ae1ba205a225.24207095' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205a632.50407419' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205a632.50407419' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNWE2MzIuNTA0MDc0MTkifQ== Dockerfile_62ae1ba205a632.50407419' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205aad8.38274675' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205aad8.38274675' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVhYWQ4LjM4Mjc0Njc1In0= Dockerfile_62ae1ba205aad8.38274675' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205ae71.70890686' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205ae71.70890686' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVhZTcxLjcwODkwNjg2In0= Dockerfile_62ae1ba205ae71.70890686' - - '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: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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205caf7.09509524' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205caf7.09509524' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVjYWY3LjA5NTA5NTI0In0= Dockerfile_62ae1ba205caf7.09509524' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205cf06.91614232' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205cf06.91614232' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1Y2YwNi45MTYxNDIzMiJ9 Dockerfile_62ae1ba205cf06.91614232' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_62ae1ba205d370.84691063' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205d370.84691063' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNWQzNzAuODQ2OTEwNjMifQ== Dockerfile_62ae1ba205d370.84691063' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205d760.24588028' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205d760.24588028' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDVkNzYwLjI0NTg4MDI4In0= Dockerfile_62ae1ba205d760.24588028' - - '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 - 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 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_62ae1ba205dbb0.94021838' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205dbb0.94021838' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1ZGJiMC45NDAyMTgzOCJ9 Dockerfile_62ae1ba205dbb0.94021838' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba205dfc7.92190217' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba205dfc7.92190217' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA1ZGZjNy45MjE5MDIxNyJ9 Dockerfile_62ae1ba205dfc7.92190217' - - '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: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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba20602d4.40769785' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20602d4.40769785' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNjAyZDQuNDA3Njk3ODUifQ== Dockerfile_62ae1ba20602d4.40769785' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba20606f5.17114685' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20606f5.17114685' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDYwNmY1LjE3MTE0Njg1In0= Dockerfile_62ae1ba20606f5.17114685' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2060b17.77215705' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2060b17.77215705' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9JU19UT09MSU1BR0UiOiIwIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82MmFlMWJhMjA2MGIxNy43NzIxNTcwNSJ9 Dockerfile_62ae1ba2060b17.77215705' - - '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' -'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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2060f01.47419866' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2060f01.47419866' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfSVNfVE9PTElNQUdFIjoiMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjJhZTFiYTIwNjBmMDEuNDc0MTk4NjYifQ== Dockerfile_62ae1ba2060f01.47419866' - - '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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba2061324.18974411' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba2061324.18974411' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDYxMzI0LjE4OTc0NDExIn0= Dockerfile_62ae1ba2061324.18974411' - - '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-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 - variables: - DOCKER_BUILDKIT: '1' - 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_62ae1ba20617a2.42823094' - - 'echo "COPY conf/ /" >> Dockerfile_62ae1ba20617a2.42823094' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX0lTX1RPT0xJTUFHRSI6IjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzYyYWUxYmEyMDYxN2EyLjQyODIzMDk0In0= Dockerfile_62ae1ba20617a2.42823094' - - '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' 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 5654caad5..e8887c0cb 100644 --- a/README.md +++ b/README.md @@ -1,133 +1,132 @@ -# 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: + +* 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). +Or join our discord https://discord.gg/gnYPfZhX + +## Build process + +### 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 +``` + +It will use the Jinja2 templates inside of the `template` directory and the +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: + +``` +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 github:generate +``` + +Gitlab CI builds every image independent 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) -## Deprecations - -### Debian/Ubuntu PHP - -The following images are DEPRECATED and not longer built automatically: - -* `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-*` - -You shall use the new images which are based on the official `php:7.(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-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-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-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-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-dev:7.4` +### Debian PHP + +The following images which are currently supported are based on `php:{VER}-fpm-buster`. + +* `webdevops/php:8.1` +* `webdevops/php:8.2` +* `webdevops/php:8.3` +* `webdevops/php:8.4` +* `webdevops/php:8.5` +* `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.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.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.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.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 -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. - -* `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-dev:7.4-alpine` -* `webdevops/php-apache:7.1-alpine` -* `webdevops/php-apache:7.2-alpine` -* `webdevops/php-apache:7.3-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-dev:7.4-alpine` -* `webdevops/php-nginx:7.1-alpine` -* `webdevops/php-nginx:7.2-alpine` -* `webdevops/php-nginx:7.3-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-dev:7.4-alpine` - -*We left out 7.0 because it would vary too much from the current versions* +The following images which are currently supported are based on `php:{VER}-fpm-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.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.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.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.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.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/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/build-local.sh b/build-local.sh new file mode 100755 index 000000000..604365667 --- /dev/null +++ b/build-local.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +set -exuo pipefail + +ROOT_DIR=$(pwd) +PHP_VERSION=8.5 + +#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 "docker/php/$PHP_VERSION" ]; then + echo "PHP version $PHP_VERSION not found" + exit 1 + fi +fi + +# 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 + +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 + +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 +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/BLACKLIST b/ci/BLACKLIST index 805309d2f..fa626e512 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -1,12 +1,8 @@ -ubuntu -debian -ansible -samson -sphinx -centos -solr -liqui 5.6 7.0 7.1 -7.2 \ No newline at end of file +7.2 +7.3 +7.4 +8.0 +ssh 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..0541b06f3 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,56 +104,53 @@ ], "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.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768" + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/864568fdc0208b3eba3638b6000b69d2386e6768", - "reference": "864568fdc0208b3eba3638b6000b69d2386e6768", + "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^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": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.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" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "psr/log": "^1|^2|^3", + "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": { @@ -178,12 +179,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v5.2.8" + "source": "https://github.com/symfony/console/tree/v6.4.9" }, "funding": [ { @@ -199,29 +200,29 @@ "type": "tidelift" } ], - "time": "2021-05-11T15:45:21+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v2.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "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/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -250,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/v2.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -266,45 +267,45 @@ "type": "tidelift" } ], - "time": "2021-03-23T23:28:01+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.1", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "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/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-ctype": "*" + }, "suggest": { "ext-ctype": "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\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -329,7 +330,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -345,20 +346,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.22.1", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170" + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" }, "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/64647a7c30b2283f5d49b874d84a18fc22054b7a", + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", "shasum": "" }, "require": { @@ -369,21 +370,18 @@ }, "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\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -410,7 +408,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.30.0" }, "funding": [ { @@ -426,20 +424,20 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.22.1", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248" + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" }, "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/a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", "shasum": "" }, "require": { @@ -450,21 +448,18 @@ }, "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\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -494,7 +489,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.30.0" }, "funding": [ { @@ -510,214 +505,51 @@ "type": "tidelift" } ], - "time": "2021-01-22T09:19:47+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.1", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "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/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "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" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, "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 +559,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.30.0" }, "funding": [ { @@ -752,25 +585,24 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/process", - "version": "v5.2.7", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e" + "reference": "25214adbb0996d18112548de20c281be9f27279f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e", - "reference": "98cb8eeb72e55d4196dd1e36f1f16e7b3a9a088e", + "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", + "reference": "25214adbb0996d18112548de20c281be9f27279f", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-php80": "^1.15" + "php": ">=8.1" }, "type": "library", "autoload": { @@ -798,7 +630,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.4.14" }, "funding": [ { @@ -814,33 +646,34 @@ "type": "tidelift" } ], - "time": "2021-04-08T10:27:02+00:00" + "time": "2024-11-06T09:25:01+00:00" }, { "name": "symfony/service-contracts", - "version": "v2.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "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/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/container": "^1.1" + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, - "suggest": { - "symfony/service-implementation": "" + "conflict": { + "ext-psr": "<1.1|>=2" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "2.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -850,7 +683,10 @@ "autoload": { "psr-4": { "Symfony\\Contracts\\Service\\": "" - } + }, + "exclude-from-classmap": [ + "/Test/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -877,7 +713,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v2.4.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -893,44 +729,48 @@ "type": "tidelift" } ], - "time": "2021-04-01T10:43:52+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v5.2.8", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db" + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", - "reference": "01b35eb64cac8467c3f94cd0ce2d0d376bb7d1db", + "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8", + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8", "shasum": "" }, "require": { - "php": ">=7.2.5", + "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", - "symfony/polyfill-php80": "~1.15" + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" }, "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/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": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -960,7 +800,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v5.2.8" + "source": "https://github.com/symfony/string/tree/v7.1.2" }, "funding": [ { @@ -976,35 +816,32 @@ "type": "tidelift" } ], - "time": "2021-05-10T14:56:10+00:00" + "time": "2024-06-28T09:27:18+00:00" }, { "name": "symfony/yaml", - "version": "v5.2.7", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5" + "reference": "52903de178d542850f6f341ba92995d3d63e60c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/76546cbeddd0a9540b4e4e57eddeec3e9bb444a5", - "reference": "76546cbeddd0a9540b4e4e57eddeec3e9bb444a5", + "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9", + "reference": "52903de178d542850f6f341ba92995d3d63e60c9", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.1", - "symfony/polyfill-ctype": "~1.8" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8" }, "conflict": { - "symfony/console": "<4.4" + "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^4.4|^5.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" @@ -1035,7 +872,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.4.8" }, "funding": [ { @@ -1051,16 +888,16 @@ "type": "tidelift" } ], - "time": "2021-04-29T20:47:09+00:00" + "time": "2024-05-31T14:49:08+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, - "platform": [], - "platform-dev": [], - "plugin-api-version": "2.0.0" + "platform": {}, + "platform-dev": {}, + "plugin-api-version": "2.6.0" } 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/GithubCommand.php b/ci/src/Commands/GithubCommand.php new file mode 100644 index 000000000..8d0af2e21 --- /dev/null +++ b/ci/src/Commands/GithubCommand.php @@ -0,0 +1,125 @@ +fileReader = new FileReader(); + $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'); + } + + protected function execute(InputInterface $input, OutputInterface $output) + { + $this->blacklist = $input->getOption('blacklist'); + if (empty($this->blacklist) && file_exists(__DIR__ . '/../../BLACKLIST')) { + $this->blacklist = file(__DIR__ . '/../../BLACKLIST', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); + } + $this->output = $output; + $tree = $this->buildTree(); + foreach ($tree->getRootNodes() as $rootNode) { + $this->traverse($rootNode); + } + + ksort($this->jobs); // system independent order of jobs + + $this->jobs = [ + 'validate-automation' => $this->jobBuilder->getValidationConfig(), + ...$this->jobs, + ];; + $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): void + { + $line = 'Processing ' . $node->getName(); + $nodeAr = $node->toArray(); + $nodeAr['level'] = $node->getLevel(); + if ($node->getLevel() > $this->deepestLevel) { + $this->deepestLevel = $node->getLevel(); + } + $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]); + foreach ($node->getChildren() as $childNode) { + $this->traverse($childNode); + } + } + + private function isNameBlacklisted(string $name): bool + { + foreach ($this->blacklist as $blacklistItem) { + if (strpos($name, $blacklistItem)) { + return true; + } + } + return false; + } + + private function buildTree(): Tree + { + $data = []; + $dockerFiles = $this->fileReader->collectDockerfiles(); + foreach ($dockerFiles as $file) { + $data[] = $this->fileReader->getInfo($file[0]); + } + return new Tree($data); + } +} diff --git a/ci/src/Commands/GitlabCommand.php b/ci/src/Commands/GitlabCommand.php deleted file mode 100644 index 82d7ef735..000000000 --- a/ci/src/Commands/GitlabCommand.php +++ /dev/null @@ -1,96 +0,0 @@ -fileReader = new FileReader(); - $this->jobBuilder = new JobBuilder(); - parent::__construct(); - $this->addOption('blacklist', 'b', InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY); - $this->_settings = Yaml::parseFile(__DIR__ . '/../../../conf/console.yml'); - } - - protected function execute(InputInterface $input, OutputInterface $output) - { - $this->blacklist = $input->getOption('blacklist'); - if (empty($this->blacklist) && file_exists(__DIR__ . '/../../BLACKLIST')) { - $this->blacklist = file(__DIR__ . '/../../BLACKLIST', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); - } - $this->output = $output; - $tree = $this->buildTree(); - foreach ($tree->getRootNodes() as $rootNode) { - $this->traverse($rootNode); - } - $gitlabCi['stages'] = array_map(function($level) {return 'level' . $level;}, range(1, $this->deepestLevel)); - $yaml = Yaml::dump(array_merge($gitlabCi, $this->jobs), 3, 2); - file_put_contents(__DIR__ . '/../../../.gitlab-ci.yml', $yaml); - return 0; - } - - private function traverse(Node $node) - { - $line = 'Processing ' . $node->getName(); - $nodeAr = $node->toArray(); - $nodeAr['level'] = $node->getLevel(); - if ($node->getLevel() > $this->deepestLevel) { - $this->deepestLevel = $node->getLevel(); - } - $this->jobs[$node->getId()] = $this->jobBuilder->getJobDescription($nodeAr); - if ($this->isNameBlacklisted($nodeAr['id'])) { -// $this->jobs[$node->getId()] = array_merge($this->jobs[$node->getId()], ['when' => 'manual']); - $line .= ' *blacklisted*'; - if ($node->get('tag') !== $this->_settings['docker']['autoLatestTag']) { - unset($this->jobs[$node->getId()]); - } - } - $this->output->write([str_pad('', $node->getLevel() - 1, "\t", STR_PAD_LEFT), $line, PHP_EOL]); - foreach ($node->getChildren() as $childNode) { - $this->traverse($childNode); - } - } - - private function isNameBlacklisted(string $name) - { - foreach ($this->blacklist as $blacklistItem) { - if (strpos($name, $blacklistItem)) { - return true; - } - } - return false; - } - - private function buildTree() - { - $data = []; - $dockerFiles = $this->fileReader->collectDockerfiles(); - foreach ($dockerFiles as $file) { - $data[] = $this->fileReader->getInfo($file[0]); - } - return new Tree($data); - } - -} 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/GithubJobBuilder.php b/ci/src/GithubJobBuilder.php new file mode 100644 index 000000000..f5679768e --- /dev/null +++ b/ci/src/GithubJobBuilder.php @@ -0,0 +1,219 @@ +> + */ + 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 [ + $jobId => [ + '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' => $node['name'] . ' (${{ matrix.arch }})', + 'needs' => $needs, + // even run if previous job skipped + 'if' => '${{ !failure() && !cancelled() }}', + 'runs-on' => '${{ matrix.runner }}', + 'container' => 'webdevops/dockerfile-build-env', + 'steps' => array_values( + array_filter( + [ + ['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 }}', + ]), + ], + ], + $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', + ]), + ], + ], + ], + ]; + } + + 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 = 'Dockerfile_test'; + $specConfig = $node['serverspec']; + $specConfig['DOCKERFILE'] = $testDockerfile; + $encodedJsonConfig = base64_encode(json_encode($specConfig)); + $script = [ + 'cd tests/serverspec', + 'echo "FROM ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}"-' . $node['tag'] . ' >> ' . $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 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 ghcr.io/webdevops/' . $node['image'] . ':sha-${{ github.sha }}-${{ matrix.arch }}-' . $node['tag'] . ' --config ' . $node['image'] . '/test.yaml'; + } + } + return $script; + } + + public function getValidationConfig(): array + { + return [ + 'name' => 'Validate Automation', + 'runs-on' => 'ubuntu-latest', + 'steps' => [ + ['uses' => 'actions/checkout@v6'], + [ + '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', + ]), + ], + ], + ]; + } +} diff --git a/ci/src/JobBuilder.php b/ci/src/JobBuilder.php deleted file mode 100644 index 2f6db3597..000000000 --- a/ci/src/JobBuilder.php +++ /dev/null @@ -1,109 +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', - 'variables' => [ - 'DOCKER_BUILDKIT' => '1', - ], - '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, - ]; - 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; - } - $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/conf/console.yml b/conf/console.yml index 085c6fc5c..e4de7f2cf 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_VERSION: '22.04' 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' @@ -68,66 +43,7 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' - 'php[^:]*:[0-9]': + 'php[^:]*:8.(0|1|2|3|4|5)': OS_FAMILY: 'debian' - OS_VERSION: '10' + OS_VERSION: '12' 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/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/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-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-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-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/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/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/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/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/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/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/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/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.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/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-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-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-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.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/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.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-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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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-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-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-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/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile deleted file mode 100644 index 557714ef5..000000000 --- a/docker/base-app/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base-app:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/base:ubuntu-12.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-12.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index a9a9ba06d..000000000 --- a/docker/base-app/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,10 +0,0 @@ -{{ docker.from("base", "ubuntu-12.04") }} - -{{ environment.baseApp() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ baseapp.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} 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-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-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-22.04/Dockerfile b/docker/base-app/ubuntu-22.04/Dockerfile new file mode 100644 index 000000000..134383c4a --- /dev/null +++ b/docker/base-app/ubuntu-22.04/Dockerfile @@ -0,0 +1,32 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/base-app:ubuntu-22.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/base:ubuntu-22.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-22.04/Dockerfile.jinja2 b/docker/base-app/ubuntu-22.04/Dockerfile.jinja2 new file mode 100644 index 000000000..6d988225e --- /dev/null +++ b/docker/base-app/ubuntu-22.04/Dockerfile.jinja2 @@ -0,0 +1,10 @@ +{{ docker.from("base", "ubuntu-22.04") }} + +{{ environment.baseApp() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ baseapp.ubuntu() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} 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/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-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-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-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/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile deleted file mode 100644 index f0a9d9ecf..000000000 --- a/docker/base/ubuntu-12.04/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/base:ubuntu-12.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:ubuntu-12.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-12.04/Dockerfile.jinja2 b/docker/base/ubuntu-12.04/Dockerfile.jinja2 deleted file mode 100644 index a38bce572..000000000 --- a/docker/base/ubuntu-12.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ -{{ docker.from("bootstrap", "ubuntu-12.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-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-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/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-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.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/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/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/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/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/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/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.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.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.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.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.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.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.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-22.04/Dockerfile b/docker/base/ubuntu-22.04/Dockerfile new file mode 100644 index 000000000..ac0736202 --- /dev/null +++ b/docker/base/ubuntu-22.04/Dockerfile @@ -0,0 +1,29 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/base:ubuntu-22.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/bootstrap:ubuntu-22.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-22.04/Dockerfile.jinja2 b/docker/base/ubuntu-22.04/Dockerfile.jinja2 new file mode 100644 index 000000000..29241a475 --- /dev/null +++ b/docker/base/ubuntu-22.04/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ docker.from("bootstrap", "ubuntu-22.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/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 b/docker/bootstrap/ubuntu-14.04/Dockerfile deleted file mode 100644 index 585be2d4c..000000000 --- a/docker/bootstrap/ubuntu-14.04/Dockerfile +++ /dev/null @@ -1,37 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/bootstrap:ubuntu-14.04 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM ubuntu:14.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-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.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 deleted file mode 100644 index 0c5903841..000000000 --- a/docker/bootstrap/ubuntu-16.04/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +0,0 @@ - -{{ docker.fromOfficial("ubuntu", "16.04") }} - -{{ docker.version() }} - -{{ environment.general() }} - -{{ baselayout.copy() }} - -RUN set -x \ - {{ bootstrap.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.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-22.04/Dockerfile b/docker/bootstrap/ubuntu-22.04/Dockerfile new file mode 100644 index 000000000..ab0c44fa7 --- /dev/null +++ b/docker/bootstrap/ubuntu-22.04/Dockerfile @@ -0,0 +1,37 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/bootstrap:ubuntu-22.04 +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + + +FROM ubuntu:22.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-22.04/Dockerfile.jinja2 b/docker/bootstrap/ubuntu-22.04/Dockerfile.jinja2 new file mode 100644 index 000000000..c9f9ae216 --- /dev/null +++ b/docker/bootstrap/ubuntu-22.04/Dockerfile.jinja2 @@ -0,0 +1,13 @@ + +{{ docker.fromOfficial("ubuntu", "22.04") }} + +{{ docker.version() }} + +{{ environment.general() }} + +{{ baselayout.copy() }} + +RUN set -x \ + {{ bootstrap.ubuntu() }} \ + {{ provision.runBootstrap() }} \ + {{ docker.cleanup() }} 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..610e71e73 100644 --- a/docker/dockerfile-build-env/latest/Dockerfile +++ b/docker/dockerfile-build-env/latest/Dockerfile @@ -3,7 +3,8 @@ # -- automatically generated -- #+++++++++++++++++++++++++++++++++++++++ -FROM webdevops/base-app:ubuntu-20.04 +FROM webdevops/base-app:ubuntu-22.04 +ARG TARGETARCH RUN apt-install \ build-essential \ @@ -19,21 +20,24 @@ 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 \ - && 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 b48088265..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-20.04") }} +{{ docker.from("base-app","ubuntu-22.04") }} +ARG TARGETARCH RUN apt-install \ build-essential \ @@ -14,21 +15,24 @@ 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 \ - && bundle update --bundler \ + && bundle _2.1.4_ update --bundler \ && cd /tmp/Dockerfile \ && make setup \ {{ docker.cleanup() }} 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 c8a0bf931..000000000 Binary files a/docker/liquidsoap/latest/conf/etc/liquidsoap/default.mp3 and /dev/null differ diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-day.pls b/docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-day.pls deleted file mode 100644 index fcd718794..000000000 --- a/docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-day.pls +++ /dev/null @@ -1 +0,0 @@ -#EXTM3U diff --git a/docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-night.pls b/docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-night.pls deleted file mode 100644 index fcd718794..000000000 --- a/docker/liquidsoap/latest/conf/etc/liquidsoap/playlist-night.pls +++ /dev/null @@ -1 +0,0 @@ -#EXTM3U diff --git a/docker/mail-sandbox/README.md b/docker/mail-sandbox/README.md deleted file mode 100644 index f7fe08606..000000000 --- a/docker/mail-sandbox/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# Mail sandbox container layout - -Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/) - -Mail sandbox which catches all mails and delivers them to a local user and is accessable via IMAP and via Web (roundcube) - -## Environment variables - -Variable | Description --------------------- | ------------------------------------------------------------------------------ -`MAILBOX_USERNAME` | Username for mailbox (Default `dev`) -`MAILBOX_PASSWORD` | Password for mailbox (Default `dev`) - -## Container info - -Image | Info ------------------------------------ | ---------------------------------------------------------------------------------- -webdevops/mail-sandbox:latest | [![](https://badge.imagelayers.io/webdevops/mail-sandbox:latest.svg)](https://imagelayers.io/?images=webdevops/mail-sandbox:latest 'Get your own badge on imagelayers.io') diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile deleted file mode 100644 index f52260237..000000000 --- a/docker/mail-sandbox/latest/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/mail-sandbox:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/php-nginx:latest - -ENV MAILBOX_USERNAME="dev" \ - MAILBOX_PASSWORD="dev" - -COPY conf/ /opt/docker/ - -RUN set -x \ - # Install services - && apt-install \ - dovecot-core \ - dovecot-imapd \ - && docker-service enable postfix \ - && docker-service enable dovecot \ - && docker-run-bootstrap \ - && docker-image-cleanup - -RUN set -x \ - # 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 - -EXPOSE 25 465 587 143 993 diff --git a/docker/mail-sandbox/latest/Dockerfile.jinja2 b/docker/mail-sandbox/latest/Dockerfile.jinja2 deleted file mode 100644 index f6ed20114..000000000 --- a/docker/mail-sandbox/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,15 +0,0 @@ -{{ docker.from("php-nginx") }} - -{{ environment.mailbox() }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ mailsandbox.ubuntu() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} - -RUN set -x \ - {{ mailsandbox.roundcube() }} - -{{ docker.expose('25 465 587 143 993') }} diff --git a/docker/mail-sandbox/latest/conf/bin/service.d/dovecot.sh b/docker/mail-sandbox/latest/conf/bin/service.d/dovecot.sh deleted file mode 100644 index c1ca9422c..000000000 --- a/docker/mail-sandbox/latest/conf/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/docker/mail-sandbox/latest/conf/etc/dovecot/local.conf b/docker/mail-sandbox/latest/conf/etc/dovecot/local.conf deleted file mode 100644 index 033012eac..000000000 --- a/docker/mail-sandbox/latest/conf/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/docker/mail-sandbox/latest/conf/etc/roundcube/config.php b/docker/mail-sandbox/latest/conf/etc/roundcube/config.php deleted file mode 100644 index 2699a3ef6..000000000 --- a/docker/mail-sandbox/latest/conf/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/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/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/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/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/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/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/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/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/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-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/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/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-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/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/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-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/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/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/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/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/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/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/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/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.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.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/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/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/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/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/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/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.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.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/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/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-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/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/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/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.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.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/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/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-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/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/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/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.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.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/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/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-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/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/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/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.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.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/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/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/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/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/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/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.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.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/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/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-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/5.6/Dockerfile b/docker/php-apache-dev/5.6/Dockerfile deleted file mode 100644 index 0f5e9ee54..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 - && 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/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/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 9c892d6df..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 - && 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/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/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 a6c0ab3f3..000000000 --- a/docker/php-apache-dev/7.1-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-2.8.1 \ - && apk del -f --purge \ - autoconf \ - 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/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/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 9213c8ad8..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 - && 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/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/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 3aab3d76e..000000000 --- a/docker/php-apache-dev/7.2-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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/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/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 c7b1552cc..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 - && 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/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/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 2d2045354..000000000 --- a/docker/php-apache-dev/7.3-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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/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/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 9f4b24b2a..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 - && 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/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/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 47833d129..000000000 --- a/docker/php-apache-dev/7.4-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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/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/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 57a0ebda2..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 - && 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.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/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/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 c67d4479a..000000000 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 4c7c36014..000000000 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +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() }} \ - {{ docker.cleanup() }} 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/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/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 7277601d3..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 - && 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/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/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.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 8784b61e7..c9fcf72fe 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 \ @@ -33,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.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-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile index aa6e765a1..70445ab4d 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 \ @@ -33,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.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-alpine/Dockerfile b/docker/php-apache-dev/8.3-alpine/Dockerfile new file mode 100644 index 000000000..b03474d47 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile @@ -0,0 +1,38 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 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..274c48746 --- /dev/null +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ 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() }} diff --git a/docker/base/debian-10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/apache-dev/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 similarity index 100% rename from docker/apache-dev/alpine/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/8.3-alpine/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/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 similarity index 100% rename from docker/apache-dev/alpine/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/8.3-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/5.6/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/5.6/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/5.6/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 similarity index 100% rename from docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/5.6/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 similarity index 100% rename from docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/5.6/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 similarity index 100% rename from docker/php-apache-dev/5.6/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/5.6/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/apache-dev/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 similarity index 100% rename from docker/apache-dev/alpine/conf/provision/entrypoint.d/20-apache-dev.sh rename to docker/php-apache-dev/8.3-alpine/conf/provision/entrypoint.d/20-apache-dev.sh diff --git a/docker/php-apache-dev/8.3/Dockerfile b/docker/php-apache-dev/8.3/Dockerfile new file mode 100644 index 000000000..e17ae173d --- /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 + && 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.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/base/debian-7/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/8.3/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.3/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/8.3/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/centos-7/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 similarity index 100% rename from docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/8.3/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.0/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.0/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.0/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 similarity index 100% rename from docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.0/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 similarity index 100% rename from docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.0/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 similarity index 100% rename from docker/php-apache-dev/7.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-apache-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/7.0/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.3/conf/provision/entrypoint.d/20-apache-dev.sh similarity index 100% rename from docker/apache-dev/centos-7/conf/provision/entrypoint.d/20-apache-dev.sh rename to docker/php-apache-dev/8.3/conf/provision/entrypoint.d/20-apache-dev.sh 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/base/debian-8/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/debian-10/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/8.4-alpine/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/debian-10/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 similarity index 100% rename from docker/apache-dev/debian-10/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/8.4-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.1-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 similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.1-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 similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.1-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 similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/7.1-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 similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh similarity index 100% rename from docker/apache-dev/debian-10/conf/provision/entrypoint.d/20-apache-dev.sh rename to docker/php-apache-dev/8.4-alpine/conf/provision/entrypoint.d/20-apache-dev.sh 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/base/debian-9/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/8.4/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.4/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/8.4/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/debian-7/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 similarity index 100% rename from docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/8.4/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.1/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.1/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.1/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 similarity index 100% rename from docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.1/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 similarity index 100% rename from docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.1/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 similarity index 100% rename from docker/php-apache-dev/7.1/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-apache-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/7.1/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.4/conf/provision/entrypoint.d/20-apache-dev.sh similarity index 100% rename from docker/apache-dev/debian-7/conf/provision/entrypoint.d/20-apache-dev.sh rename to docker/php-apache-dev/8.4/conf/provision/entrypoint.d/20-apache-dev.sh 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/base/ubuntu-12.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/8.5-alpine/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/debian-8/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 similarity index 100% rename from docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/8.5-alpine/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.2-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 similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.2-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 similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.2-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 similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/7.2-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 similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/20-apache-dev.sh similarity index 100% rename from docker/apache-dev/debian-8/conf/provision/entrypoint.d/20-apache-dev.sh rename to docker/php-apache-dev/8.5-alpine/conf/provision/entrypoint.d/20-apache-dev.sh 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/base/ubuntu-14.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh b/docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.sh rename to docker/php-apache-dev/8.5/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-apache-dev/8.5/conf/etc/httpd/conf.d/02-dev.conf similarity index 100% rename from docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf rename to docker/php-apache-dev/8.5/conf/etc/httpd/conf.d/02-dev.conf diff --git a/docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache-dev/debian-9/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 similarity index 100% rename from docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf rename to docker/php-apache-dev/8.5/conf/etc/httpd/vhost.common.d/02-dev.conf diff --git a/docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-apache-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.2/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-apache-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.2/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.2/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 similarity index 100% rename from docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.2/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 similarity index 100% rename from docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.2/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 similarity index 100% rename from docker/php-apache-dev/7.2/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-apache-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/7.2/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-apache-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh b/docker/php-apache-dev/8.5/conf/provision/entrypoint.d/20-apache-dev.sh similarity index 100% rename from docker/apache-dev/debian-9/conf/provision/entrypoint.d/20-apache-dev.sh rename to docker/php-apache-dev/8.5/conf/provision/entrypoint.d/20-apache-dev.sh 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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 66ac95743..000000000 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ /dev/null @@ -1,34 +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 \ - && docker-image-cleanup - -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 9c90154e7..000000000 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,13 +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.cleanup() }} - -{{ 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-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 new file mode 100644 index 000000000..9dc541057 --- /dev/null +++ b/docker/php-apache/8.3-alpine/Dockerfile @@ -0,0 +1,33 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 + +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..59e5ec3ff --- /dev/null +++ b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,12 @@ +{{ docker.from("php", "8.3-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/apache/centos-7/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 similarity index 100% rename from docker/apache/centos-7/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache/7.1-alpine/conf/bin/service.d/httpd.sh rename to docker/php-apache/8.3-alpine/conf/bin/service.d/httpd.sh diff --git a/docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache-dev/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/centos-7/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 similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/global.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/global.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/global.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/main.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/main.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/main.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/php.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/php.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/php.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/centos-7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/centos-7/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/ssl/server.key rename to docker/php-apache/8.3-alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/centos-7/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 similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/vhost.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/8.3-alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/centos-7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.3-alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/centos-7/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/8.3-alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/apache/centos-7/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-apache.sh similarity index 100% rename from docker/apache/centos-7/conf/provision/bootstrap.d/10-apache.sh rename to docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-apache.sh diff --git a/docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache/5.6/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache/8.3-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/centos-7/conf/provision/bootstrap.d/.gitkeep rename to docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/apache/centos-7/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/20-apache.sh similarity index 100% rename from docker/apache/centos-7/conf/provision/entrypoint.d/20-apache.sh rename to docker/php-apache/8.3-alpine/conf/provision/entrypoint.d/20-apache.sh 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/apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.3/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/apache/debian-10/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/8.3/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/apache/debian-10/conf/bin/service.d/httpd.sh b/docker/php-apache/8.3/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/apache/debian-10/conf/bin/service.d/httpd.sh rename to docker/php-apache/8.3/conf/bin/service.d/httpd.sh diff --git a/docker/apache/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.3/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/centos-7/conf/provision/entrypoint.d/.gitkeep rename to docker/php-apache/8.3/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/8.3/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/8.3/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/8.3/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.3/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/8.3/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/global.conf b/docker/php-apache/8.3/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/global.conf rename to docker/php-apache/8.3/conf/etc/httpd/global.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/main.conf b/docker/php-apache/8.3/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/main.conf rename to docker/php-apache/8.3/conf/etc/httpd/main.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/php.conf b/docker/php-apache/8.3/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/php.conf rename to docker/php-apache/8.3/conf/etc/httpd/php.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/8.3/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/debian-10/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/8.3/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/debian-10/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.3/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/ssl/server.key rename to docker/php-apache/8.3/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/8.3/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/8.3/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/vhost.conf rename to docker/php-apache/8.3/conf/etc/httpd/vhost.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.3/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/8.3/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/debian-10/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.3/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/debian-10/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/8.3/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.3/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/debian-10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.3/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/apache/debian-10/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.3/conf/provision/bootstrap.d/10-apache.sh similarity index 100% rename from docker/apache/debian-10/conf/provision/bootstrap.d/10-apache.sh rename to docker/php-apache/8.3/conf/provision/bootstrap.d/10-apache.sh diff --git a/docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.3/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache/7.0/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache/8.3/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.3/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/debian-10/conf/provision/bootstrap.d/.gitkeep rename to docker/php-apache/8.3/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/apache/debian-10/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.3/conf/provision/entrypoint.d/20-apache.sh similarity index 100% rename from docker/apache/debian-10/conf/provision/entrypoint.d/20-apache.sh rename to docker/php-apache/8.3/conf/provision/entrypoint.d/20-apache.sh 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/apache/debian-7/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 similarity index 100% rename from docker/apache/debian-7/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache/7.2-alpine/conf/bin/service.d/httpd.sh rename to docker/php-apache/8.4-alpine/conf/bin/service.d/httpd.sh diff --git a/docker/apache/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/debian-10/conf/provision/entrypoint.d/.gitkeep rename to docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/debian-7/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 similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/global.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/global.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/global.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/main.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/main.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/main.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/php.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/php.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/php.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/debian-7/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/debian-7/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/ssl/server.key rename to docker/php-apache/8.4-alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/debian-7/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 similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/vhost.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/8.4-alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/debian-7/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.4-alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/debian-7/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/8.4-alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/apache/debian-7/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-apache.sh similarity index 100% rename from docker/apache/debian-7/conf/provision/bootstrap.d/10-apache.sh rename to docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-apache.sh diff --git a/docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache/7.1-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache/8.4-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/debian-7/conf/provision/bootstrap.d/.gitkeep rename to docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/apache/debian-7/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/20-apache.sh similarity index 100% rename from docker/apache/debian-7/conf/provision/entrypoint.d/20-apache.sh rename to docker/php-apache/8.4-alpine/conf/provision/entrypoint.d/20-apache.sh 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/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.4/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/apache/debian-8/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/8.4/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/apache/debian-7/conf/bin/service.d/httpd.sh b/docker/php-apache/8.4/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/apache/debian-7/conf/bin/service.d/httpd.sh rename to docker/php-apache/8.4/conf/bin/service.d/httpd.sh diff --git a/docker/apache/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.4/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/debian-7/conf/provision/entrypoint.d/.gitkeep rename to docker/php-apache/8.4/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/8.4/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/8.4/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/8.4/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.4/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/8.4/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/global.conf b/docker/php-apache/8.4/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/global.conf rename to docker/php-apache/8.4/conf/etc/httpd/global.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/main.conf b/docker/php-apache/8.4/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/main.conf rename to docker/php-apache/8.4/conf/etc/httpd/main.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/php.conf b/docker/php-apache/8.4/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/php.conf rename to docker/php-apache/8.4/conf/etc/httpd/php.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/8.4/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/debian-8/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/8.4/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/debian-8/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.4/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/ssl/server.key rename to docker/php-apache/8.4/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/8.4/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/8.4/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/vhost.conf rename to docker/php-apache/8.4/conf/etc/httpd/vhost.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.4/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/8.4/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/debian-8/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.4/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/debian-8/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/8.4/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.4/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.4/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/apache/debian-8/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.4/conf/provision/bootstrap.d/10-apache.sh similarity index 100% rename from docker/apache/debian-8/conf/provision/bootstrap.d/10-apache.sh rename to docker/php-apache/8.4/conf/provision/bootstrap.d/10-apache.sh diff --git a/docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.4/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache/7.1/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache/8.4/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.4/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/debian-8/conf/provision/bootstrap.d/.gitkeep rename to docker/php-apache/8.4/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/apache/debian-8/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.4/conf/provision/entrypoint.d/20-apache.sh similarity index 100% rename from docker/apache/debian-8/conf/provision/entrypoint.d/20-apache.sh rename to docker/php-apache/8.4/conf/provision/entrypoint.d/20-apache.sh 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/apache/debian-9/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 similarity index 100% rename from docker/apache/debian-9/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh b/docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/php-apache/7.3-alpine/conf/bin/service.d/httpd.sh rename to docker/php-apache/8.5-alpine/conf/bin/service.d/httpd.sh diff --git a/docker/apache/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/debian-8/conf/provision/entrypoint.d/.gitkeep rename to docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/debian-9/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 similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/global.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/global.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/global.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/main.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/main.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/main.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/php.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/php.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/php.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/debian-9/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/debian-9/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/ssl/server.key rename to docker/php-apache/8.5-alpine/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/debian-9/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 similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/vhost.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/8.5-alpine/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/debian-9/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.5-alpine/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/debian-9/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/8.5-alpine/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/apache/debian-9/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-apache.sh similarity index 100% rename from docker/apache/debian-9/conf/provision/bootstrap.d/10-apache.sh rename to docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-apache.sh diff --git a/docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache/7.2-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache/8.5-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/debian-9/conf/provision/bootstrap.d/.gitkeep rename to docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/apache/debian-9/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/20-apache.sh similarity index 100% rename from docker/apache/debian-9/conf/provision/entrypoint.d/20-apache.sh rename to docker/php-apache/8.5-alpine/conf/provision/entrypoint.d/20-apache.sh 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/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh b/docker/php-apache/8.5/conf/bin/service.d/httpd.d/10-init.sh similarity index 100% rename from docker/apache/ubuntu-12.04/conf/bin/service.d/httpd.d/10-init.sh rename to docker/php-apache/8.5/conf/bin/service.d/httpd.d/10-init.sh diff --git a/docker/apache/debian-8/conf/bin/service.d/httpd.sh b/docker/php-apache/8.5/conf/bin/service.d/httpd.sh similarity index 100% rename from docker/apache/debian-8/conf/bin/service.d/httpd.sh rename to docker/php-apache/8.5/conf/bin/service.d/httpd.sh diff --git a/docker/apache/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/php-apache/8.5/conf/etc/httpd/conf.d/.gitkeep similarity index 100% rename from docker/apache/debian-9/conf/provision/entrypoint.d/.gitkeep rename to docker/php-apache/8.5/conf/etc/httpd/conf.d/.gitkeep diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-error-document.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-error-document.conf rename to docker/php-apache/8.5/conf/etc/httpd/conf.d/10-error-document.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-log.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-log.conf rename to docker/php-apache/8.5/conf/etc/httpd/conf.d/10-log.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-php.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-php.conf rename to docker/php-apache/8.5/conf/etc/httpd/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf b/docker/php-apache/8.5/conf/etc/httpd/conf.d/10-server.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/10-server.conf rename to docker/php-apache/8.5/conf/etc/httpd/conf.d/10-server.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/global.conf b/docker/php-apache/8.5/conf/etc/httpd/global.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/global.conf rename to docker/php-apache/8.5/conf/etc/httpd/global.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/main.conf b/docker/php-apache/8.5/conf/etc/httpd/main.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/main.conf rename to docker/php-apache/8.5/conf/etc/httpd/main.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/php.conf b/docker/php-apache/8.5/conf/etc/httpd/php.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/php.conf rename to docker/php-apache/8.5/conf/etc/httpd/php.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.crt rename to docker/php-apache/8.5/conf/etc/httpd/ssl/server.crt diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.csr rename to docker/php-apache/8.5/conf/etc/httpd/ssl/server.csr diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key b/docker/php-apache/8.5/conf/etc/httpd/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/ssl/server.key rename to docker/php-apache/8.5/conf/etc/httpd/ssl/server.key diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.conf rename to docker/php-apache/8.5/conf/etc/httpd/vhost.common.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/.gitkeep diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/01-boilerplate.conf rename to docker/php-apache/8.5/conf/etc/httpd/vhost.common.d/01-boilerplate.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.conf rename to docker/php-apache/8.5/conf/etc/httpd/vhost.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf b/docker/php-apache/8.5/conf/etc/httpd/vhost.ssl.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.ssl.conf rename to docker/php-apache/8.5/conf/etc/httpd/vhost.ssl.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf b/docker/php-apache/8.5/conf/etc/supervisor.d/apache.conf similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/supervisor.d/apache.conf rename to docker/php-apache/8.5/conf/etc/supervisor.d/apache.conf diff --git a/docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-apache/8.5/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-apache/8.5/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh b/docker/php-apache/8.5/conf/provision/bootstrap.d/10-apache.sh similarity index 100% rename from docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/10-apache.sh rename to docker/php-apache/8.5/conf/provision/bootstrap.d/10-apache.sh diff --git a/docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-apache/8.5/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache/7.2/conf/provision/bootstrap.d/10-php.sh rename to docker/php-apache/8.5/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-apache/8.5/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-apache/8.5/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh b/docker/php-apache/8.5/conf/provision/entrypoint.d/20-apache.sh similarity index 100% rename from docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/20-apache.sh rename to docker/php-apache/8.5/conf/provision/entrypoint.d/20-apache.sh 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/5.6/Dockerfile b/docker/php-dev/5.6/Dockerfile deleted file mode 100644 index a898438a8..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 - && 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/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/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 7d3295b42..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 - && 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/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/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 d56dda9e2..000000000 --- a/docker/php-dev/7.1-alpine/Dockerfile +++ /dev/null @@ -1,29 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-2.8.1 \ - && apk del -f --purge \ - autoconf \ - 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/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/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 42d845f61..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 - && 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/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/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 a2586ad85..000000000 --- a/docker/php-dev/7.2-alpine/Dockerfile +++ /dev/null @@ -1,29 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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/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/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 9d5ce4a3b..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 - && 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/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/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 0164825ac..000000000 --- a/docker/php-dev/7.3-alpine/Dockerfile +++ /dev/null @@ -1,29 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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 5c53a4cfa..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 - && 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 33dd4f39b..000000000 --- a/docker/php-dev/7.4-alpine/Dockerfile +++ /dev/null @@ -1,29 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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 6293b0ab4..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 - && 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.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 1d8cf4f16..000000000 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ /dev/null @@ -1,29 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 99986a428..000000000 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,8 +0,0 @@ -{{ docker.from("php", "8.0-alpine") }} - -{{ docker.copy('conf/', '/opt/docker/') }} - -RUN set -x \ - {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} 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 338aca88e..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 - && 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.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index bec9c6118..8befbec67 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 \ @@ -25,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.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-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 61fe7e220..4ddf0a3d0 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 \ @@ -25,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.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-alpine/Dockerfile b/docker/php-dev/8.3-alpine/Dockerfile new file mode 100644 index 000000000..73d20a09f --- /dev/null +++ b/docker/php-dev/8.3-alpine/Dockerfile @@ -0,0 +1,30 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 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..599e24028 --- /dev/null +++ b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,7 @@ +{{ docker.from("php", "8.3-alpine") }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.3") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-15.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/5.6/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 similarity index 100% rename from docker/php-dev/5.6/conf/bin/service.d/ssh.d/99-development.sh rename to docker/php-dev/8.3-alpine/conf/bin/service.d/ssh.d/99-development.sh diff --git a/docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/99-development.sh similarity index 100% rename from docker/php-dev/5.6/conf/provision/bootstrap.d/99-development.sh rename to docker/php-dev/8.3-alpine/conf/provision/bootstrap.d/99-development.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/php-dev/8.3/Dockerfile b/docker/php-dev/8.3/Dockerfile new file mode 100644 index 000000000..02f9c1b41 --- /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 + && 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.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/base/ubuntu-15.10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-15.10/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/8.3/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.3/conf/bin/service.d/ssh.d/99-development.sh similarity index 100% rename from docker/php-dev/7.0/conf/bin/service.d/ssh.d/99-development.sh rename to docker/php-dev/8.3/conf/bin/service.d/ssh.d/99-development.sh diff --git a/docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.3/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.3/conf/provision/bootstrap.d/10-php.sh rename to docker/php-dev/8.3/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.3/conf/provision/bootstrap.d/99-development.sh similarity index 100% rename from docker/php-dev/7.0/conf/provision/bootstrap.d/99-development.sh rename to docker/php-dev/8.3/conf/provision/bootstrap.d/99-development.sh diff --git a/docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/7.3/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh 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/base/ubuntu-16.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-16.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/7.1-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 similarity index 100% rename from docker/php-dev/7.1-alpine/conf/bin/service.d/ssh.d/99-development.sh rename to docker/php-dev/8.4-alpine/conf/bin/service.d/ssh.d/99-development.sh diff --git a/docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/99-development.sh similarity index 100% rename from docker/php-dev/7.1-alpine/conf/provision/bootstrap.d/99-development.sh rename to docker/php-dev/8.4-alpine/conf/provision/bootstrap.d/99-development.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh 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/base/ubuntu-16.10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-16.10/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/7.4/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/8.4/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.4/conf/bin/service.d/ssh.d/99-development.sh similarity index 100% rename from docker/php-dev/7.1/conf/bin/service.d/ssh.d/99-development.sh rename to docker/php-dev/8.4/conf/bin/service.d/ssh.d/99-development.sh diff --git a/docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/7.4/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/7.4/conf/provision/bootstrap.d/10-php.sh rename to docker/php-dev/8.4/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/7.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 similarity index 100% rename from docker/php-apache-dev/7.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.4/conf/provision/bootstrap.d/99-development.sh similarity index 100% rename from docker/php-dev/7.1/conf/provision/bootstrap.d/99-development.sh rename to docker/php-dev/8.4/conf/provision/bootstrap.d/99-development.sh diff --git a/docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/7.4/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh 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/base/ubuntu-17.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-17.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/7.2-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 similarity index 100% rename from docker/php-dev/7.2-alpine/conf/bin/service.d/ssh.d/99-development.sh rename to docker/php-dev/8.5-alpine/conf/bin/service.d/ssh.d/99-development.sh diff --git a/docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/8.0-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 similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/8.0-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 similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/8.0-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 similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/99-development.sh similarity index 100% rename from docker/php-dev/7.2-alpine/conf/provision/bootstrap.d/99-development.sh rename to docker/php-dev/8.5-alpine/conf/provision/bootstrap.d/99-development.sh diff --git a/docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/8.0-alpine/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh 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/base/ubuntu-17.10/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-17.10/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh b/docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/8.0/conf/bin/service.d/blackfire-agent.sh rename to docker/php-dev/8.5/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh b/docker/php-dev/8.5/conf/bin/service.d/ssh.d/99-development.sh similarity index 100% rename from docker/php-dev/7.2/conf/bin/service.d/ssh.d/99-development.sh rename to docker/php-dev/8.5/conf/bin/service.d/ssh.d/99-development.sh diff --git a/docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/8.0/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/8.0/conf/provision/bootstrap.d/10-php.sh rename to docker/php-dev/8.5/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh similarity index 100% rename from docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh similarity index 100% rename from docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh similarity index 100% rename from docker/php-apache-dev/8.0/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh b/docker/php-dev/8.5/conf/provision/bootstrap.d/99-development.sh similarity index 100% rename from docker/php-dev/7.2/conf/provision/bootstrap.d/99-development.sh rename to docker/php-dev/8.5/conf/provision/bootstrap.d/99-development.sh diff --git a/docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/8.0/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh 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/5.6/Dockerfile b/docker/php-nginx-dev/5.6/Dockerfile deleted file mode 100644 index 2e66059d1..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 - && 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 d2e934393..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 - && 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 c437e9283..000000000 --- a/docker/php-nginx-dev/7.1-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug-2.8.1 \ - && apk del -f --purge \ - autoconf \ - 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 52749cecb..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 - && 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 bbbee499c..000000000 --- a/docker/php-nginx-dev/7.2-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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 962b2840c..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 - && 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 1fd7fd7b8..000000000 --- a/docker/php-nginx-dev/7.3-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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 d850f59c1..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 - && 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 34dfb843c..000000000 --- a/docker/php-nginx-dev/7.4-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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 802cf0af8..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 - && 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.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 2a2f8ec32..000000000 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ /dev/null @@ -1,37 +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 \ - make \ - autoconf \ - g++ \ - && pecl install xdebug \ - && apk del -f --purge \ - autoconf \ - 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.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 deleted file mode 100644 index 15a0bcd4c..000000000 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,12 +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() }} \ - {{ docker.cleanup() }} 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 cf025157f..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 - && 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.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index 3e96d5a73..e2f717632 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 \ @@ -33,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.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-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile index 7c130a99f..e2b649587 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 \ @@ -33,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.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-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile new file mode 100644 index 000000000..f5a822f7f --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile @@ -0,0 +1,38 @@ +#+++++++++++++++++++++++++++++++++++++++ +# Dockerfile for webdevops/php-nginx-dev:8.3-alpine +# -- automatically generated -- +#+++++++++++++++++++++++++++++++++++++++ + +FROM webdevops/php-nginx: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 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..81e512b17 --- /dev/null +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,11 @@ +{{ docker.from("php-nginx", "8.3-alpine") }} + +{{ environment.web() }} +{{ environment.webPhp() }} +{{ environment.webDevelopment() }} + +{{ docker.copy('conf/', '/opt/docker/') }} + +RUN set -x \ + {{ php.officialDevelopmentAlpine(version="8.3") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-18.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/8.3-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/nginx-dev/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 similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/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 similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/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 similarity index 100% rename from docker/nginx-dev/alpine/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/8.3-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx-dev/alpine/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx-dev/alpine/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/centos-7-php56/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 similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/centos-7-php56/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 similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/centos-7-php56/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 similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php56/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/nginx-dev/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 similarity index 100% rename from docker/nginx-dev/alpine/conf/provision/entrypoint.d/20-nginx-dev.sh rename to docker/php-nginx-dev/8.3-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh diff --git a/docker/php-nginx-dev/8.3/Dockerfile b/docker/php-nginx-dev/8.3/Dockerfile new file mode 100644 index 000000000..64936aa2f --- /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 + && 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.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/base/ubuntu-20.04/conf/bin/service.d/supervisor.d/10-init.sh b/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-20.04/conf/bin/service.d/supervisor.d/10-init.sh rename to docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/8.3/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.3/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/8.3/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/centos-7/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 similarity index 100% rename from docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/centos-7/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 similarity index 100% rename from docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/8.3/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-apache-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/8.3/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx-dev/centos-7/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/centos-7-php7/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 similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/centos-7-php7/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 similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/centos-7-php7/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 similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-nginx-dev/8.3/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/centos-7-php7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/20-nginx-dev.sh similarity index 100% rename from docker/nginx-dev/centos-7/conf/provision/entrypoint.d/20-nginx-dev.sh rename to docker/php-nginx-dev/8.3/conf/provision/entrypoint.d/20-nginx-dev.sh 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..0c59288ac --- /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.4") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/mail-sandbox/latest/conf/bin/service.d/dovecot.d/10-init.sh b/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh similarity index 100% rename from docker/mail-sandbox/latest/conf/bin/service.d/dovecot.d/10-init.sh rename to docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/centos-7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/8.4-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/debian-10/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/debian-10/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 similarity index 100% rename from docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/debian-10/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 similarity index 100% rename from docker/nginx-dev/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-apache-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/centos-7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/8.4-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx-dev/debian-10/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/centos-7/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 similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/centos-7/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 similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/centos-7/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 similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/centos-7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh similarity index 100% rename from docker/nginx-dev/debian-10/conf/provision/entrypoint.d/20-nginx-dev.sh rename to docker/php-nginx-dev/8.4-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh 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-apache-dev/5.6/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 similarity index 100% rename from docker/php-apache-dev/5.6/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/debian-10/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/8.4/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.4/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/8.4/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/debian-7/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 similarity index 100% rename from docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/debian-7/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 similarity index 100% rename from docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/8.4/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-apache-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/debian-10/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/8.4/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx-dev/debian-7/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/debian-10/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 similarity index 100% rename from docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/debian-10/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 similarity index 100% rename from docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/debian-10/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 similarity index 100% rename from docker/php-apache-dev/debian-10/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-nginx-dev/8.4/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/debian-10/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/20-nginx-dev.sh similarity index 100% rename from docker/nginx-dev/debian-7/conf/provision/entrypoint.d/20-nginx-dev.sh rename to docker/php-nginx-dev/8.4/conf/provision/entrypoint.d/20-nginx-dev.sh 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..b44bb2998 --- /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.5") }} \ + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/7.0/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 similarity index 100% rename from docker/php-apache-dev/7.0/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/debian-7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/8.5-alpine/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/debian-8/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 similarity index 100% rename from docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/debian-8/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 similarity index 100% rename from docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-apache-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/debian-7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/8.5-alpine/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx-dev/debian-8/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/debian-7/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 similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/debian-7/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 similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/debian-7/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 similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/debian-7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh similarity index 100% rename from docker/nginx-dev/debian-8/conf/provision/entrypoint.d/20-nginx-dev.sh rename to docker/php-nginx-dev/8.5-alpine/conf/provision/entrypoint.d/20-nginx-dev.sh 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-apache-dev/7.1-alpine/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 similarity index 100% rename from docker/php-apache-dev/7.1-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.d/10-init.sh diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh b/docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.sh similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/bin/service.d/blackfire-agent.sh rename to docker/php-nginx-dev/8.5/conf/bin/service.d/blackfire-agent.sh diff --git a/docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-nginx-dev/8.5/conf/etc/nginx/conf.d/02-dev.conf similarity index 100% rename from docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf rename to docker/php-nginx-dev/8.5/conf/etc/nginx/conf.d/02-dev.conf diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx-dev/debian-9/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 similarity index 100% rename from docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf rename to docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/02-dev.conf diff --git a/docker/nginx-dev/debian-9/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 similarity index 100% rename from docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx-dev/8.5/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf b/docker/php-nginx-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/etc/supervisor.d/blackfire-agent.conf rename to docker/php-nginx-dev/8.5/conf/etc/supervisor.d/blackfire-agent.conf diff --git a/docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.10/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx-dev/debian-9/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/php-apache-dev/debian-8-php7/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 similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-blackfire.sh rename to docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-blackfire.sh diff --git a/docker/php-apache-dev/debian-8-php7/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 similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-opcache.sh rename to docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-opcache.sh diff --git a/docker/php-apache-dev/debian-8-php7/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 similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/bootstrap.d/20-php-module-xdebug.sh rename to docker/php-nginx-dev/8.5/conf/provision/bootstrap.d/20-php-module-xdebug.sh diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh similarity index 100% rename from docker/php-apache-dev/debian-8-php7/conf/provision/entrypoint.d/10-php-debugger.sh rename to docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/10-php-debugger.sh diff --git a/docker/nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh b/docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/20-nginx-dev.sh similarity index 100% rename from docker/nginx-dev/debian-9/conf/provision/entrypoint.d/20-nginx-dev.sh rename to docker/php-nginx-dev/8.5/conf/provision/entrypoint.d/20-nginx-dev.sh 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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/5.6/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/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.0/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/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/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.1-alpine/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/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.1/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/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/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.2-alpine/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/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.2/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/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/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.3-alpine/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.3/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.4-alpine/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/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 109fbb31b..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 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/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 4ddba251d..000000000 --- a/docker/php-nginx/7.4/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/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 ea2937ac3..000000000 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ /dev/null @@ -1,25 +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 \ - && docker-image-cleanup - -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 6d867c42b..000000000 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ /dev/null @@ -1,14 +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.cleanup() }} - -{{ 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 109fbb31b..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 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.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 4ddba251d..000000000 --- a/docker/php-nginx/8.0-alpine/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/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 109fbb31b..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 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.0/conf/etc/nginx/vhost.ssl.conf b/docker/php-nginx/8.0/conf/etc/nginx/vhost.ssl.conf deleted file mode 100644 index 4ddba251d..000000000 --- a/docker/php-nginx/8.0/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/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-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.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/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.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/Dockerfile b/docker/php-nginx/8.3-alpine/Dockerfile new file mode 100644 index 000000000..d07da4e2b --- /dev/null +++ b/docker/php-nginx/8.3-alpine/Dockerfile @@ -0,0 +1,24 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 + +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..1fa397bae --- /dev/null +++ b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,13 @@ +{{ 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.expose('80 443') }} diff --git a/docker/nginx/centos-7/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 similarity index 100% rename from docker/nginx/centos-7/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/centos-7/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/centos-7/conf/bin/service.d/nginx.sh rename to docker/php-nginx/8.3-alpine/conf/bin/service.d/nginx.sh diff --git a/docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-15.10/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/global.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/global.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/global.conf diff --git a/docker/nginx/centos-7/conf/etc/nginx/main.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/main.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/main.conf diff --git a/docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx/7.1-alpine/conf/etc/nginx/nginx.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/nginx.conf diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/php.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/php.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/php.conf diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.crt rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.csr rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key b/docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-14.04/conf/etc/httpd/ssl/server.key rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/centos-7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/centos-7/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 similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/centos-7/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 similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/centos-7/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 similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/centos-7/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 similarity index 100% rename from docker/nginx/centos-7/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/8.3-alpine/conf/etc/nginx/vhost.common.d/10-php.conf 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..b4df6d710 --- /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 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.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..28e8aab17 --- /dev/null +++ b/docker/php-nginx/8.3-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/nginx/centos-7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.3-alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/centos-7/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/8.3-alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx/centos-7/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-nginx/5.6/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx/8.3-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/20-nginx.sh similarity index 100% rename from docker/nginx/centos-7/conf/provision/entrypoint.d/20-nginx.sh rename to docker/php-nginx/8.3-alpine/conf/provision/entrypoint.d/20-nginx.sh 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/nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.3/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/nginx/debian-10/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/8.3/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/debian-10/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.3/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/debian-10/conf/bin/service.d/nginx.sh rename to docker/php-nginx/8.3/conf/bin/service.d/nginx.sh diff --git a/docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.3/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx/8.3/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.3/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/8.3/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/global.conf b/docker/php-nginx/8.3/conf/etc/nginx/global.conf similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/global.conf rename to docker/php-nginx/8.3/conf/etc/nginx/global.conf diff --git a/docker/nginx/debian-10/conf/etc/nginx/main.conf b/docker/php-nginx/8.3/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/main.conf rename to docker/php-nginx/8.3/conf/etc/nginx/main.conf diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/php.conf b/docker/php-nginx/8.3/conf/etc/nginx/php.conf similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/php.conf rename to docker/php-nginx/8.3/conf/etc/nginx/php.conf diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.crt rename to docker/php-nginx/8.3/conf/etc/nginx/ssl/server.crt diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.csr rename to docker/php-nginx/8.3/conf/etc/nginx/ssl/server.csr diff --git a/docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key b/docker/php-nginx/8.3/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-15.04/conf/etc/httpd/ssl/server.key rename to docker/php-nginx/8.3/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/8.3/conf/etc/nginx/vhost.common.conf diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/debian-10/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 similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/8.3/conf/etc/nginx/vhost.common.d/10-php.conf 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..b4df6d710 --- /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 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.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..28e8aab17 --- /dev/null +++ b/docker/php-nginx/8.3/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/nginx/debian-10/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.3/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/debian-10/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/8.3/conf/etc/supervisor.d/nginx.conf diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx/8.3/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx/8.3/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx/debian-10/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx/8.3/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.3/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-nginx/7.0/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx/8.3/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.3/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.10/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx/8.3/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.3/conf/provision/entrypoint.d/20-nginx.sh similarity index 100% rename from docker/nginx/debian-10/conf/provision/entrypoint.d/20-nginx.sh rename to docker/php-nginx/8.3/conf/provision/entrypoint.d/20-nginx.sh 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/nginx/debian-7/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 similarity index 100% rename from docker/nginx/debian-7/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/debian-7/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/debian-7/conf/bin/service.d/nginx.sh rename to docker/php-nginx/8.4-alpine/conf/bin/service.d/nginx.sh diff --git a/docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-16.10/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/global.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/global.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/global.conf diff --git a/docker/nginx/debian-7/conf/etc/nginx/main.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/main.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/main.conf diff --git a/docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx/7.2-alpine/conf/etc/nginx/nginx.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/nginx.conf diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/php.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/php.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/php.conf diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.crt rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.csr rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key b/docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-15.10/conf/etc/httpd/ssl/server.key rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/debian-7/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/debian-7/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 similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/debian-7/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 similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/debian-7/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 similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/debian-7/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 similarity index 100% rename from docker/nginx/debian-7/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/8.4-alpine/conf/etc/nginx/vhost.common.d/10-php.conf 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/nginx/debian-7/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.4-alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/debian-7/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/8.4-alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx/debian-7/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-nginx/7.1-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx/8.4-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/20-nginx.sh similarity index 100% rename from docker/nginx/debian-7/conf/provision/entrypoint.d/20-nginx.sh rename to docker/php-nginx/8.4-alpine/conf/provision/entrypoint.d/20-nginx.sh 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/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.4/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/nginx/debian-8/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/8.4/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/debian-8/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.4/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/debian-8/conf/bin/service.d/nginx.sh rename to docker/php-nginx/8.4/conf/bin/service.d/nginx.sh diff --git a/docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.4/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx/8.4/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.4/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/8.4/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/global.conf b/docker/php-nginx/8.4/conf/etc/nginx/global.conf similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/global.conf rename to docker/php-nginx/8.4/conf/etc/nginx/global.conf diff --git a/docker/nginx/debian-8/conf/etc/nginx/main.conf b/docker/php-nginx/8.4/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/main.conf rename to docker/php-nginx/8.4/conf/etc/nginx/main.conf diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/php.conf b/docker/php-nginx/8.4/conf/etc/nginx/php.conf similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/php.conf rename to docker/php-nginx/8.4/conf/etc/nginx/php.conf diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.crt rename to docker/php-nginx/8.4/conf/etc/nginx/ssl/server.crt diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.csr rename to docker/php-nginx/8.4/conf/etc/nginx/ssl/server.csr diff --git a/docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key b/docker/php-nginx/8.4/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-16.04/conf/etc/httpd/ssl/server.key rename to docker/php-nginx/8.4/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/8.4/conf/etc/nginx/vhost.common.conf diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.10/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/debian-8/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 similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/8.4/conf/etc/nginx/vhost.common.d/10-php.conf 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/nginx/debian-8/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.4/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/debian-8/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/8.4/conf/etc/supervisor.d/nginx.conf diff --git a/docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx/8.4/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.10/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx/8.4/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx/debian-8/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx/8.4/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.4/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-nginx/7.1/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx/8.4/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.4/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.10/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx/8.4/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.4/conf/provision/entrypoint.d/20-nginx.sh similarity index 100% rename from docker/nginx/debian-8/conf/provision/entrypoint.d/20-nginx.sh rename to docker/php-nginx/8.4/conf/provision/entrypoint.d/20-nginx.sh 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/nginx/debian-9/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 similarity index 100% rename from docker/nginx/debian-9/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/debian-9/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/debian-9/conf/bin/service.d/nginx.sh rename to docker/php-nginx/8.5-alpine/conf/bin/service.d/nginx.sh diff --git a/docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-17.10/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/global.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/global.conf similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/global.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/global.conf diff --git a/docker/nginx/debian-9/conf/etc/nginx/main.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/main.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/main.conf diff --git a/docker/php-nginx/7.3-alpine/conf/etc/nginx/nginx.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/nginx.conf similarity index 100% rename from docker/php-nginx/7.3-alpine/conf/etc/nginx/nginx.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/nginx.conf diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/php.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/php.conf similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/php.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/php.conf diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.crt rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.crt diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.csr rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.csr diff --git a/docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key b/docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-16.10/conf/etc/httpd/ssl/server.key rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/debian-9/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.conf diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-18.04/conf/etc/httpd/conf.d/.gitkeep rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/debian-9/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 similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/debian-9/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 similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/debian-9/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 similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/debian-9/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 similarity index 100% rename from docker/nginx/debian-9/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/8.5-alpine/conf/etc/nginx/vhost.common.d/10-php.conf 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/nginx/debian-9/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.5-alpine/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/debian-9/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/8.5-alpine/conf/etc/supervisor.d/nginx.conf diff --git a/docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-18.04/conf/etc/httpd/vhost.common.d/.gitkeep rename to docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx/debian-9/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-nginx/7.2-alpine/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx/8.5-alpine/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-18.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/20-nginx.sh similarity index 100% rename from docker/nginx/debian-9/conf/provision/entrypoint.d/20-nginx.sh rename to docker/php-nginx/8.5-alpine/conf/provision/entrypoint.d/20-nginx.sh 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/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh b/docker/php-nginx/8.5/conf/bin/service.d/nginx.d/10-init.sh similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.d/10-init.sh rename to docker/php-nginx/8.5/conf/bin/service.d/nginx.d/10-init.sh diff --git a/docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh b/docker/php-nginx/8.5/conf/bin/service.d/nginx.sh similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/bin/service.d/nginx.sh rename to docker/php-nginx/8.5/conf/bin/service.d/nginx.sh diff --git a/docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-nginx/8.5/conf/etc/nginx/conf.d/.gitkeep similarity index 100% rename from docker/apache/ubuntu-18.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-nginx/8.5/conf/etc/nginx/conf.d/.gitkeep diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf b/docker/php-nginx/8.5/conf/etc/nginx/conf.d/10-php.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/conf.d/10-php.conf rename to docker/php-nginx/8.5/conf/etc/nginx/conf.d/10-php.conf diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/global.conf b/docker/php-nginx/8.5/conf/etc/nginx/global.conf similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/global.conf rename to docker/php-nginx/8.5/conf/etc/nginx/global.conf diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/main.conf b/docker/php-nginx/8.5/conf/etc/nginx/main.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/main.conf rename to docker/php-nginx/8.5/conf/etc/nginx/main.conf diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/php.conf b/docker/php-nginx/8.5/conf/etc/nginx/php.conf similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/php.conf rename to docker/php-nginx/8.5/conf/etc/nginx/php.conf diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.crt similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.crt rename to docker/php-nginx/8.5/conf/etc/nginx/ssl/server.crt diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.csr similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.csr rename to docker/php-nginx/8.5/conf/etc/nginx/ssl/server.csr diff --git a/docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key b/docker/php-nginx/8.5/conf/etc/nginx/ssl/server.key similarity index 100% rename from docker/apache/ubuntu-17.04/conf/etc/httpd/ssl/server.key rename to docker/php-nginx/8.5/conf/etc/nginx/ssl/server.key diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.conf rename to docker/php-nginx/8.5/conf/etc/nginx/vhost.common.conf diff --git a/docker/base/centos-7/conf/etc/cron/.gitkeep b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/etc/cron/.gitkeep rename to docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/.gitkeep diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-general.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-general.conf rename to docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-general.conf diff --git a/docker/nginx/ubuntu-12.04/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 similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-location-root.conf rename to docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-location-root.conf diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-log.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-log.conf rename to docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-log.conf diff --git a/docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf b/docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-php.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/nginx/vhost.common.d/10-php.conf rename to docker/php-nginx/8.5/conf/etc/nginx/vhost.common.d/10-php.conf 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/nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf b/docker/php-nginx/8.5/conf/etc/supervisor.d/nginx.conf similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/etc/supervisor.d/nginx.conf rename to docker/php-nginx/8.5/conf/etc/supervisor.d/nginx.conf diff --git a/docker/base/centos-7/conf/etc/supervisor.d/.gitkeep b/docker/php-nginx/8.5/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/etc/supervisor.d/.gitkeep rename to docker/php-nginx/8.5/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh b/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-nginx.sh similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/provision/bootstrap.d/10-nginx.sh rename to docker/php-nginx/8.5/conf/provision/bootstrap.d/10-nginx.sh diff --git a/docker/php-nginx/7.2/conf/provision/bootstrap.d/10-php.sh b/docker/php-nginx/8.5/conf/provision/bootstrap.d/10-php.sh similarity index 100% rename from docker/php-nginx/7.2/conf/provision/bootstrap.d/10-php.sh rename to docker/php-nginx/8.5/conf/provision/bootstrap.d/10-php.sh diff --git a/docker/base/centos-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-nginx/8.5/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/provision/bootstrap.d/.gitkeep rename to docker/php-nginx/8.5/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh b/docker/php-nginx/8.5/conf/provision/entrypoint.d/20-nginx.sh similarity index 100% rename from docker/nginx/ubuntu-12.04/conf/provision/entrypoint.d/20-nginx.sh rename to docker/php-nginx/8.5/conf/provision/entrypoint.d/20-nginx.sh 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-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile deleted file mode 100644 index 0953a1976..000000000 --- a/docker/php-official/5.6/Dockerfile +++ /dev/null @@ -1,216 +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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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 --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 \ - bz2 \ - calendar \ - exif \ - intl \ - gettext \ - ldap \ - mysqli \ - mcrypt \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - && 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/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-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/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/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/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-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/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/30-setup-ioncube.sh b/docker/php-official/5.6/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php-official/5.6/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-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/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 79021199d..000000000 --- a/docker/php-official/7.0/Dockerfile +++ /dev/null @@ -1,221 +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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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 --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 \ - bz2 \ - calendar \ - exif \ - intl \ - gettext \ - ldap \ - mysqli \ - mcrypt \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - && 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/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-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/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/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/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-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/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/30-setup-ioncube.sh b/docker/php-official/7.0/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php-official/7.0/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-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/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 e63d2bab0..000000000 --- a/docker/php-official/7.1-alpine/Dockerfile +++ /dev/null @@ -1,235 +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 \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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-66-1/icu4c-66_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 \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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/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/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-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/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/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/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-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/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/30-setup-ioncube.sh b/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php-official/7.1-alpine/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-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/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 a13ec5969..000000000 --- a/docker/php-official/7.1/Dockerfile +++ /dev/null @@ -1,221 +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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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 --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 \ - bz2 \ - calendar \ - exif \ - intl \ - gettext \ - ldap \ - mysqli \ - mcrypt \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - && 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/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-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/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/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/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-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/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/30-setup-ioncube.sh b/docker/php-official/7.1/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php-official/7.1/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-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/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 f49243351..000000000 --- a/docker/php-official/7.2-alpine/Dockerfile +++ /dev/null @@ -1,239 +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 \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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-66-1/icu4c-66_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 \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - 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 \ - # 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 \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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/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/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-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/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/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/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-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/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/30-setup-ioncube.sh b/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php-official/7.2-alpine/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-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/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 71dd6d72d..000000000 --- a/docker/php-official/7.2/Dockerfile +++ /dev/null @@ -1,220 +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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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 --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 \ - bz2 \ - calendar \ - exif \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - && 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/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-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/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/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/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-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/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.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 18a6a9e47..000000000 --- a/docker/php-official/7.2/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-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/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 e6c9b320a..000000000 --- a/docker/php-official/7.3-alpine/Dockerfile +++ /dev/null @@ -1,239 +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 \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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-66-1/icu4c-66_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 \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - 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 \ - # 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 \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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/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/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/30-setup-ioncube.sh b/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/30-setup-ioncube.sh deleted file mode 100644 index 18a6a9e47..000000000 --- a/docker/php-official/7.3-alpine/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-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 b69a08538..000000000 --- a/docker/php-official/7.3/Dockerfile +++ /dev/null @@ -1,220 +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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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 --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 \ - bz2 \ - calendar \ - exif \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - hash \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - && 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 18a6a9e47..000000000 --- a/docker/php-official/7.3/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-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 003b52fce..000000000 --- a/docker/php-official/7.4-alpine/Dockerfile +++ /dev/null @@ -1,242 +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 \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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-66-1/icu4c-66_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 master --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 \ - 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 \ - 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 \ - # 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 \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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 18a6a9e47..000000000 --- a/docker/php-official/7.4-alpine/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-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 96d9df76e..000000000 --- a/docker/php-official/7.4/Dockerfile +++ /dev/null @@ -1,219 +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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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 --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 \ - bz2 \ - calendar \ - exif \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - sysvmsg \ - sysvsem \ - sysvshm \ - shmop \ - xmlrpc \ - xsl \ - zip \ - gd \ - gettext \ - 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 \ - && 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 18a6a9e47..000000000 --- a/docker/php-official/7.4/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-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 e7f8519b2..000000000 --- a/docker/php-official/8.0-alpine/Dockerfile +++ /dev/null @@ -1,242 +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.12/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 \ - libzip \ - libmemcached \ - yaml \ - # Build dependencies - autoconf \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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-66-1/icu4c-66_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 master --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 \ - ffi \ - imagick \ - amqp \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - 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 \ - g++ \ - make \ - libtool \ - pcre-dev \ - gettext-dev \ - freetype-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 f16042680..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.12') }} - -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 18a6a9e47..000000000 --- a/docker/php-official/8.0-alpine/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-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 569eadf08..000000000 --- a/docker/php-official/8.0/Dockerfile +++ /dev/null @@ -1,219 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/php-official:8.0 -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - - -FROM php:8.0-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 \ - libxslt1.1 \ - zlibc \ - 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 \ - # 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-66-1/icu4c-66_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/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 \ - intl \ - gettext \ - ldap \ - mysqli \ - imap \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - tokenizer \ - 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 \ - && 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 70656d01e..000000000 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ /dev/null @@ -1,37 +0,0 @@ - -{{ docker.fromOfficial("php", "8.0-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='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/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 18a6a9e47..000000000 --- a/docker/php-official/8.0/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-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 89879b3fa..75a8cace3 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.12/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 @@ -101,10 +99,12 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -112,6 +112,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -139,13 +140,13 @@ 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 \ && 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 \ @@ -154,6 +155,8 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ + gmp \ ffi \ imagick \ amqp \ @@ -167,7 +170,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ @@ -175,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 @@ -185,6 +187,9 @@ RUN set -x \ && docker-php-ext-install $MEMCACHED \ && rm -rf $MEMCACHED \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf-4.33.5 \ && pecl install vips \ && pecl install yaml \ && pecl install redis \ @@ -192,6 +197,9 @@ RUN set -x \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ @@ -201,12 +209,14 @@ RUN set -x \ # 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 \ @@ -232,8 +242,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 b5e4c40d0..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.12') }} + {{ 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.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..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,8 +1,13 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + 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/Dockerfile b/docker/php-official/8.1/Dockerfile index 9bdbdfcc6..24be23a39 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 \ @@ -97,9 +97,9 @@ RUN set -x \ # Libraries libvips42 \ librabbitmq4 \ - libldap-2.4-2 \ + libldap-2.5-0 \ libxslt1.1 \ - zlibc \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ @@ -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 \ @@ -134,23 +135,26 @@ 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 \ && 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/ \ + && 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 \ @@ -169,15 +173,20 @@ RUN set -x \ xsl \ zip \ gd \ - gettext \ opcache \ && pecl install memcached \ && pecl install apcu \ + && pecl install excimer \ + && pecl install opentelemetry \ + && pecl install protobuf-4.33.5 \ && 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 \ @@ -202,6 +211,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/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.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..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,8 +1,13 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + 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/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 3a4dc9c9f..8309a82fd 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 \ @@ -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.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 @@ -101,10 +99,12 @@ RUN set -x \ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -112,6 +112,7 @@ RUN set -x \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -124,7 +125,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -139,13 +140,13 @@ 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 \ && 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 \ @@ -154,6 +155,8 @@ RUN set -x \ bz2 \ calendar \ exif \ + ftp \ + gmp \ ffi \ imagick \ amqp \ @@ -167,7 +170,7 @@ RUN set -x \ pdo_pgsql \ pgsql \ soap \ - sockets \ + sockets \ sysvmsg \ sysvsem \ sysvshm \ @@ -175,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 @@ -185,6 +187,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 \ @@ -192,6 +197,9 @@ RUN set -x \ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ @@ -201,12 +209,14 @@ RUN set -x \ # 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 \ @@ -219,7 +229,7 @@ RUN set -x \ icu-dev \ postgresql-dev \ libxml2-dev \ - ldb-dev \ + samba-dev \ pcre-dev \ libxslt-dev \ libzip-dev \ @@ -232,8 +242,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 101c138a7..874bd9698 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() }} @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.12') }} + {{ 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() }} + {{ php.officialAlpine(version='8.2') }} \ + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }} 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..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,8 +1,13 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + 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/Dockerfile b/docker/php-official/8.2/Dockerfile index 208ffed08..cde3347c3 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-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 \ @@ -97,9 +97,9 @@ RUN set -x \ # Libraries libvips42 \ librabbitmq4 \ - libldap-2.4-2 \ + libldap-2.5-0 \ libxslt1.1 \ - zlibc \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ @@ -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 \ @@ -134,23 +135,26 @@ 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 \ && 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/ \ + && 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 \ @@ -169,15 +173,20 @@ RUN set -x \ 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 \ @@ -202,6 +211,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/Dockerfile.jinja2 b/docker/php-official/8.2/Dockerfile.jinja2 index 4c5817e5c..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-rc-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.1') }} \ + {{ php.official(version='8.2',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} 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..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,8 +1,13 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + 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/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile new file mode 100644 index 000000000..79aaf7bbb --- /dev/null +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -0,0 +1,250 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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.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 \ + && 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 \ + 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.3-alpine/Dockerfile.jinja2 b/docker/php-official/8.3-alpine/Dockerfile.jinja2 new file mode 100644 index 000000000..a11af6e8b --- /dev/null +++ b/docker/php-official/8.3-alpine/Dockerfile.jinja2 @@ -0,0 +1,35 @@ + +{{ 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.20') }} + +RUN set -x \ + {{ base.alpine() }} \ + {{ provision.runBootstrap() }} + +RUN set -x \ + {{ baseapp.alpine() }} \ + {{ provision.runBootstrap() }} + +RUN set -x \ + {{ php.officialAlpine(version='8.3') }} \ + {{ provision.runBootstrap() }} + +{{ docker.workdir('/') }} +{{ docker.expose('9000') }} +{{ docker.entrypoint("/entrypoint") }} +{{ docker.cmd("supervisord") }} diff --git a/docker/base/debian-10/conf/VERSION b/docker/php-official/8.3-alpine/conf/VERSION similarity index 100% rename from docker/base/debian-10/conf/VERSION rename to docker/php-official/8.3-alpine/conf/VERSION diff --git a/docker/base/debian-10/conf/bin/bootstrap.sh b/docker/php-official/8.3-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/debian-10/conf/bin/bootstrap.sh rename to docker/php-official/8.3-alpine/conf/bin/bootstrap.sh diff --git a/docker/base/debian-10/conf/bin/config.sh b/docker/php-official/8.3-alpine/conf/bin/config.sh similarity index 100% rename from docker/base/debian-10/conf/bin/config.sh rename to docker/php-official/8.3-alpine/conf/bin/config.sh diff --git a/docker/base/debian-10/conf/bin/control.sh b/docker/php-official/8.3-alpine/conf/bin/control.sh similarity index 100% rename from docker/base/debian-10/conf/bin/control.sh rename to docker/php-official/8.3-alpine/conf/bin/control.sh diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/debian-10/conf/bin/entrypoint.d/cli.sh rename to docker/php-official/8.3-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/debian-10/conf/bin/entrypoint.d/default.sh rename to docker/php-official/8.3-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/debian-10/conf/bin/entrypoint.d/noop.sh rename to docker/php-official/8.3-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/debian-10/conf/bin/entrypoint.d/root.sh rename to docker/php-official/8.3-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/debian-10/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/debian-10/conf/bin/entrypoint.d/supervisord.sh rename to docker/php-official/8.3-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/debian-10/conf/bin/entrypoint.sh b/docker/php-official/8.3-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/debian-10/conf/bin/entrypoint.sh rename to docker/php-official/8.3-alpine/conf/bin/entrypoint.sh diff --git a/docker/base/debian-10/conf/bin/provision b/docker/php-official/8.3-alpine/conf/bin/provision similarity index 100% rename from docker/base/debian-10/conf/bin/provision rename to docker/php-official/8.3-alpine/conf/bin/provision diff --git a/docker/base/debian-10/conf/bin/provision.py b/docker/php-official/8.3-alpine/conf/bin/provision.py similarity index 100% rename from docker/base/debian-10/conf/bin/provision.py rename to docker/php-official/8.3-alpine/conf/bin/provision.py diff --git a/docker/base/debian-10/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 similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/cron.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/bin/service.d/cron.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/cron.sh diff --git a/docker/base/debian-10/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 similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/debian-10/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/dnsmasq.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/5.6/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 similarity index 100% rename from docker/php-official/5.6/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/5.6/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 similarity index 100% rename from docker/php-official/5.6/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php-official/5.6/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/5.6/conf/bin/service.d/php-fpm.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/base/debian-10/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 similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/debian-10/conf/bin/service.d/postfix.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/postfix.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-10/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 similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/debian-10/conf/bin/service.d/ssh.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/ssh.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/7.1/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/debian-10/conf/bin/service.d/supervisor.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/supervisor.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/base/debian-10/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 similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/debian-10/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/debian-10/conf/bin/service.d/syslog-ng.sh rename to docker/php-official/8.3-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/debian-10/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/container-file-auto-restore rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/docker-ansible-install rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/docker-cronjob rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/5.6/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/5.6/conf/bin/usr-bin/docker-php-setting rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-provision b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/docker-provision rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-provision diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-service b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/docker-service rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/docker-service-disable rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/debian-10/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/docker-service-enable rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/debian-10/conf/bin/usr-bin/service b/docker/php-official/8.3-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/service rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/service diff --git a/docker/base/debian-10/conf/bin/usr-bin/version-compare b/docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/debian-10/conf/bin/usr-bin/version-compare rename to docker/php-official/8.3-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/base/centos-7/conf/provision/build.d/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/provision/build.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.3-alpine/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php-official/5.6/conf/etc/logrotate.d/php5-fpm rename to docker/php-official/8.3-alpine/conf/etc/logrotate.d/php5-fpm diff --git a/docker/base/debian-10/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/debian-10/conf/etc/logrotate.d/syslog-ng rename to docker/php-official/8.3-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/centos-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/base/centos-7/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/5.6/conf/etc/php/php.ini b/docker/php-official/8.3-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/5.6/conf/etc/php/php.ini rename to docker/php-official/8.3-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/5.6/conf/etc/php/php.webdevops.ini b/docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/5.6/conf/etc/php/php.webdevops.ini rename to docker/php-official/8.3-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/base/debian-10/conf/etc/supervisor.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.conf diff --git a/docker/base/centos-7/conf/provision/roles/.gitkeep b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/provision/roles/.gitkeep rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/debian-10/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.d/cron.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/debian-10/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/5.6/conf/etc/supervisor.d/php-fpm.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/base/debian-10/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.d/postfix.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/debian-10/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.d/ssh.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-10/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.d/syslog.conf rename to docker/php-official/8.3-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/debian-10/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/debian-10/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php-official/8.3-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/debian-10/conf/provision/ansible.cfg b/docker/php-official/8.3-alpine/conf/provision/ansible.cfg similarity index 100% rename from docker/base/debian-10/conf/provision/ansible.cfg rename to docker/php-official/8.3-alpine/conf/provision/ansible.cfg diff --git a/docker/base/centos-7/conf/provision/service.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/centos-7/conf/provision/service.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/debian-10/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/debian-10/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/5.6/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/debian-10/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/5.6/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/base-app/debian-10/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/debian-10/conf/provision/bootstrap.d/20-app.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/5.6/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 similarity index 100% rename from docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/5.6/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 similarity index 100% rename from docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh 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..4a348a38a --- /dev/null +++ b/docker/php-official/8.3-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/base/debian-10/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/debian-10/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php-official/8.3-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/base/debian-10/conf/etc/cron/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/etc/cron/.gitkeep rename to docker/php-official/8.3-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/base/debian-10/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/debian-10/conf/provision/build.d/10-cleanup.sh rename to docker/php-official/8.3-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/debian-10/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/debian-10/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/debian-10/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php-official/8.3-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/5.6/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh rename to docker/php-official/8.3-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/base/debian-10/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/debian-10/conf/provision/build.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/roles/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/provision/build.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/provision/roles/.gitkeep diff --git a/docker/base/debian-10/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.3-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/base/debian-10/conf/provision/service.d/cron.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/debian-10/conf/provision/service.d/cron.sh rename to docker/php-official/8.3-alpine/conf/provision/service.d/cron.sh diff --git a/docker/base/debian-10/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-10/conf/provision/service.d/dnsmasq.sh rename to docker/php-official/8.3-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/debian-10/conf/provision/service.d/postfix.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/debian-10/conf/provision/service.d/postfix.sh rename to docker/php-official/8.3-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/base/debian-10/conf/provision/service.d/ssh.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/debian-10/conf/provision/service.d/ssh.sh rename to docker/php-official/8.3-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/base/debian-10/conf/provision/service.d/syslog.sh b/docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/debian-10/conf/provision/service.d/syslog.sh rename to docker/php-official/8.3-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/base/debian-10/conf/provision/variables-webdevops.yml b/docker/php-official/8.3-alpine/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/debian-10/conf/provision/variables-webdevops.yml rename to docker/php-official/8.3-alpine/conf/provision/variables-webdevops.yml diff --git a/docker/base/debian-10/conf/provision/variables.yml b/docker/php-official/8.3-alpine/conf/provision/variables.yml similarity index 100% rename from docker/base/debian-10/conf/provision/variables.yml rename to docker/php-official/8.3-alpine/conf/provision/variables.yml diff --git a/docker/php-official/8.3/Dockerfile b/docker/php-official/8.3/Dockerfile new file mode 100644 index 000000000..7377141ac --- /dev/null +++ b/docker/php-official/8.3/Dockerfile @@ -0,0 +1,228 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 \ + 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 \ + 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.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/base/debian-7/conf/VERSION b/docker/php-official/8.3/conf/VERSION similarity index 100% rename from docker/base/debian-7/conf/VERSION rename to docker/php-official/8.3/conf/VERSION diff --git a/docker/base/debian-7/conf/bin/bootstrap.sh b/docker/php-official/8.3/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/debian-7/conf/bin/bootstrap.sh rename to docker/php-official/8.3/conf/bin/bootstrap.sh diff --git a/docker/base/debian-7/conf/bin/config.sh b/docker/php-official/8.3/conf/bin/config.sh similarity index 100% rename from docker/base/debian-7/conf/bin/config.sh rename to docker/php-official/8.3/conf/bin/config.sh diff --git a/docker/base/debian-7/conf/bin/control.sh b/docker/php-official/8.3/conf/bin/control.sh similarity index 100% rename from docker/base/debian-7/conf/bin/control.sh rename to docker/php-official/8.3/conf/bin/control.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/debian-7/conf/bin/entrypoint.d/cli.sh rename to docker/php-official/8.3/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/debian-7/conf/bin/entrypoint.d/default.sh rename to docker/php-official/8.3/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/debian-7/conf/bin/entrypoint.d/noop.sh rename to docker/php-official/8.3/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/debian-7/conf/bin/entrypoint.d/root.sh rename to docker/php-official/8.3/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/debian-7/conf/bin/entrypoint.d/supervisord.sh rename to docker/php-official/8.3/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/php-official/8.3/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/debian-7/conf/bin/entrypoint.sh rename to docker/php-official/8.3/conf/bin/entrypoint.sh diff --git a/docker/base/debian-7/conf/bin/provision b/docker/php-official/8.3/conf/bin/provision similarity index 100% rename from docker/base/debian-7/conf/bin/provision rename to docker/php-official/8.3/conf/bin/provision diff --git a/docker/base/debian-7/conf/bin/provision.py b/docker/php-official/8.3/conf/bin/provision.py similarity index 100% rename from docker/base/debian-7/conf/bin/provision.py rename to docker/php-official/8.3/conf/bin/provision.py diff --git a/docker/base/debian-7/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/cron.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/debian-7/conf/bin/service.d/cron.sh b/docker/php-official/8.3/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/cron.sh rename to docker/php-official/8.3/conf/bin/service.d/cron.sh diff --git a/docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/debian-7/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/dnsmasq.sh rename to docker/php-official/8.3/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/7.0/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 similarity index 100% rename from docker/php-official/7.0/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/7.0/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 similarity index 100% rename from docker/php-official/7.0/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php-official/8.3/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php-official/7.0/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.3/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/7.0/conf/bin/service.d/php-fpm.sh rename to docker/php-official/8.3/conf/bin/service.d/php-fpm.sh diff --git a/docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/debian-7/conf/bin/service.d/postfix.sh b/docker/php-official/8.3/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/postfix.sh rename to docker/php-official/8.3/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/debian-7/conf/bin/service.d/ssh.sh b/docker/php-official/8.3/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/ssh.sh rename to docker/php-official/8.3/conf/bin/service.d/ssh.sh diff --git a/docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/7.2-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/debian-7/conf/bin/service.d/supervisor.sh b/docker/php-official/8.3/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/supervisor.sh rename to docker/php-official/8.3/conf/bin/service.d/supervisor.sh diff --git a/docker/base/debian-7/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 similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php-official/8.3/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/debian-7/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/debian-7/conf/bin/service.d/syslog-ng.sh rename to docker/php-official/8.3/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/debian-7/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/container-file-auto-restore rename to docker/php-official/8.3/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.3/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/docker-ansible-install rename to docker/php-official/8.3/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/docker-cronjob rename to docker/php-official/8.3/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/7.0/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/7.0/conf/bin/usr-bin/docker-php-setting rename to docker/php-official/8.3/conf/bin/usr-bin/docker-php-setting diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-provision b/docker/php-official/8.3/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/docker-provision rename to docker/php-official/8.3/conf/bin/usr-bin/docker-provision diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service b/docker/php-official/8.3/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/docker-service rename to docker/php-official/8.3/conf/bin/usr-bin/docker-service diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/docker-service-disable rename to docker/php-official/8.3/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/debian-7/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/docker-service-enable rename to docker/php-official/8.3/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/debian-7/conf/bin/usr-bin/service b/docker/php-official/8.3/conf/bin/usr-bin/service similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/service rename to docker/php-official/8.3/conf/bin/usr-bin/service diff --git a/docker/base/debian-7/conf/bin/usr-bin/version-compare b/docker/php-official/8.3/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/debian-7/conf/bin/usr-bin/version-compare rename to docker/php-official/8.3/conf/bin/usr-bin/version-compare diff --git a/docker/base/debian-10/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.3/conf/etc/cron/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.3/conf/etc/cron/.gitkeep diff --git a/docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.3/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php-official/7.0/conf/etc/logrotate.d/php5-fpm rename to docker/php-official/8.3/conf/etc/logrotate.d/php5-fpm diff --git a/docker/base/debian-7/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/debian-7/conf/etc/logrotate.d/syslog-ng rename to docker/php-official/8.3/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/debian-10/conf/provision/roles/.gitkeep b/docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/provision/roles/.gitkeep rename to docker/php-official/8.3/conf/etc/php/conf.d/.gitkeep diff --git a/docker/base/debian-10/conf/provision/service.d/.gitkeep b/docker/php-official/8.3/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/base/debian-10/conf/provision/service.d/.gitkeep rename to docker/php-official/8.3/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/7.0/conf/etc/php/php.ini b/docker/php-official/8.3/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/7.0/conf/etc/php/php.ini rename to docker/php-official/8.3/conf/etc/php/php.ini diff --git a/docker/php-official/7.0/conf/etc/php/php.webdevops.ini b/docker/php-official/8.3/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/7.0/conf/etc/php/php.webdevops.ini rename to docker/php-official/8.3/conf/etc/php/php.webdevops.ini diff --git a/docker/base/debian-7/conf/etc/supervisor.conf b/docker/php-official/8.3/conf/etc/supervisor.conf similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.conf rename to docker/php-official/8.3/conf/etc/supervisor.conf diff --git a/docker/base/debian-7/conf/etc/cron/.gitkeep b/docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/etc/cron/.gitkeep rename to docker/php-official/8.3/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/debian-7/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.3/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.d/cron.conf rename to docker/php-official/8.3/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php-official/8.3/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/7.0/conf/etc/supervisor.d/php-fpm.conf rename to docker/php-official/8.3/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/base/debian-7/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.d/postfix.conf rename to docker/php-official/8.3/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/debian-7/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.d/ssh.conf rename to docker/php-official/8.3/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-7/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.d/syslog.conf rename to docker/php-official/8.3/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/debian-7/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php-official/8.3/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/debian-7/conf/provision/ansible.cfg b/docker/php-official/8.3/conf/provision/ansible.cfg similarity index 100% rename from docker/base/debian-7/conf/provision/ansible.cfg rename to docker/php-official/8.3/conf/provision/ansible.cfg diff --git a/docker/base/debian-7/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.3/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/debian-7/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/debian-7/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/7.0/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/debian-7/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/base-app/debian-10/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/base-app/debian-10/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/7.0/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/base-app/debian-7/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/debian-7/conf/provision/bootstrap.d/20-app.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/7.0/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 similarity index 100% rename from docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/5.6/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/20-setup-php.sh 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..4a348a38a --- /dev/null +++ b/docker/php-official/8.3/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/base/debian-7/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/debian-7/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php-official/8.3/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/base/debian-7/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.3/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.3/conf/provision/build.d/.gitkeep diff --git a/docker/base/debian-7/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/debian-7/conf/provision/build.d/10-cleanup.sh rename to docker/php-official/8.3/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/debian-7/conf/provision/build.d/.gitkeep b/docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/provision/build.d/.gitkeep rename to docker/php-official/8.3/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/debian-7/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php-official/8.3/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/7.0/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php-official/8.3/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh rename to docker/php-official/8.3/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/base/debian-7/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.3/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.3/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/debian-7/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.3/conf/provision/roles/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.3/conf/provision/roles/.gitkeep diff --git a/docker/base/debian-7/conf/provision/roles/.gitkeep b/docker/php-official/8.3/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/provision/roles/.gitkeep rename to docker/php-official/8.3/conf/provision/service.d/.gitkeep diff --git a/docker/base/debian-7/conf/provision/service.d/cron.sh b/docker/php-official/8.3/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/debian-7/conf/provision/service.d/cron.sh rename to docker/php-official/8.3/conf/provision/service.d/cron.sh diff --git a/docker/base/debian-7/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-7/conf/provision/service.d/dnsmasq.sh rename to docker/php-official/8.3/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/debian-7/conf/provision/service.d/postfix.sh b/docker/php-official/8.3/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/debian-7/conf/provision/service.d/postfix.sh rename to docker/php-official/8.3/conf/provision/service.d/postfix.sh diff --git a/docker/base/debian-7/conf/provision/service.d/ssh.sh b/docker/php-official/8.3/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/debian-7/conf/provision/service.d/ssh.sh rename to docker/php-official/8.3/conf/provision/service.d/ssh.sh diff --git a/docker/base/debian-7/conf/provision/service.d/syslog.sh b/docker/php-official/8.3/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/debian-7/conf/provision/service.d/syslog.sh rename to docker/php-official/8.3/conf/provision/service.d/syslog.sh diff --git a/docker/base/debian-7/conf/provision/variables-webdevops.yml b/docker/php-official/8.3/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/debian-7/conf/provision/variables-webdevops.yml rename to docker/php-official/8.3/conf/provision/variables-webdevops.yml diff --git a/docker/base/debian-7/conf/provision/variables.yml b/docker/php-official/8.3/conf/provision/variables.yml similarity index 100% rename from docker/base/debian-7/conf/provision/variables.yml rename to docker/php-official/8.3/conf/provision/variables.yml diff --git a/docker/php-official/8.4-alpine/Dockerfile b/docker/php-official/8.4-alpine/Dockerfile new file mode 100644 index 000000000..9aa55af3d --- /dev/null +++ b/docker/php-official/8.4-alpine/Dockerfile @@ -0,0 +1,248 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 \ + 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 \ + 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.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/base/debian-8/conf/VERSION b/docker/php-official/8.4-alpine/conf/VERSION similarity index 100% rename from docker/base/debian-8/conf/VERSION rename to docker/php-official/8.4-alpine/conf/VERSION diff --git a/docker/base/debian-8/conf/bin/bootstrap.sh b/docker/php-official/8.4-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/debian-8/conf/bin/bootstrap.sh rename to docker/php-official/8.4-alpine/conf/bin/bootstrap.sh diff --git a/docker/base/debian-8/conf/bin/config.sh b/docker/php-official/8.4-alpine/conf/bin/config.sh similarity index 100% rename from docker/base/debian-8/conf/bin/config.sh rename to docker/php-official/8.4-alpine/conf/bin/config.sh diff --git a/docker/base/debian-8/conf/bin/control.sh b/docker/php-official/8.4-alpine/conf/bin/control.sh similarity index 100% rename from docker/base/debian-8/conf/bin/control.sh rename to docker/php-official/8.4-alpine/conf/bin/control.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/debian-8/conf/bin/entrypoint.d/cli.sh rename to docker/php-official/8.4-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/debian-8/conf/bin/entrypoint.d/default.sh rename to docker/php-official/8.4-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/debian-8/conf/bin/entrypoint.d/noop.sh rename to docker/php-official/8.4-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/debian-8/conf/bin/entrypoint.d/root.sh rename to docker/php-official/8.4-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/debian-8/conf/bin/entrypoint.d/supervisord.sh rename to docker/php-official/8.4-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/php-official/8.4-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/debian-8/conf/bin/entrypoint.sh rename to docker/php-official/8.4-alpine/conf/bin/entrypoint.sh diff --git a/docker/base/debian-8/conf/bin/provision b/docker/php-official/8.4-alpine/conf/bin/provision similarity index 100% rename from docker/base/debian-8/conf/bin/provision rename to docker/php-official/8.4-alpine/conf/bin/provision diff --git a/docker/base/debian-8/conf/bin/provision.py b/docker/php-official/8.4-alpine/conf/bin/provision.py similarity index 100% rename from docker/base/debian-8/conf/bin/provision.py rename to docker/php-official/8.4-alpine/conf/bin/provision.py diff --git a/docker/base/debian-8/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 similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/cron.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/bin/service.d/cron.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/cron.sh diff --git a/docker/base/debian-8/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 similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/debian-8/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/dnsmasq.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/7.1-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 similarity index 100% rename from docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/7.1-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 similarity index 100% rename from docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/bin/service.d/php-fpm.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/base/debian-8/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 similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/debian-8/conf/bin/service.d/postfix.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/postfix.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-8/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 similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/debian-8/conf/bin/service.d/ssh.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/ssh.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/7.2/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/debian-8/conf/bin/service.d/supervisor.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/supervisor.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/base/debian-8/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 similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/debian-8/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/syslog-ng.sh rename to docker/php-official/8.4-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/debian-8/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/container-file-auto-restore rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/docker-ansible-install rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/docker-cronjob rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/7.1-alpine/conf/bin/usr-bin/docker-php-setting rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-provision b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/docker-provision rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-provision diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/docker-service rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/docker-service-disable rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/debian-8/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/docker-service-enable rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/debian-8/conf/bin/usr-bin/service b/docker/php-official/8.4-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/service rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/service diff --git a/docker/base/debian-8/conf/bin/usr-bin/version-compare b/docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/debian-8/conf/bin/usr-bin/version-compare rename to docker/php-official/8.4-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/base/debian-7/conf/provision/service.d/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/base/debian-7/conf/provision/service.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/7.1-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.4-alpine/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php-official/7.1-alpine/conf/etc/logrotate.d/php5-fpm rename to docker/php-official/8.4-alpine/conf/etc/logrotate.d/php5-fpm diff --git a/docker/base/debian-8/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/debian-8/conf/etc/logrotate.d/syslog-ng rename to docker/php-official/8.4-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/debian-8/conf/etc/cron/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/etc/cron/.gitkeep rename to docker/php-official/8.4-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/base/debian-8/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/7.1-alpine/conf/etc/php/php.ini b/docker/php-official/8.4-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/7.1-alpine/conf/etc/php/php.ini rename to docker/php-official/8.4-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/7.1-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/7.1-alpine/conf/etc/php/php.webdevops.ini rename to docker/php-official/8.4-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/base/debian-8/conf/etc/supervisor.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.conf diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/debian-8/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.d/cron.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/7.1-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/7.1-alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/base/debian-8/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.d/postfix.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/debian-8/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.d/ssh.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-8/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/debian-8/conf/etc/supervisor.d/syslog.conf rename to docker/php-official/8.4-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/debian-8/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php-official/8.4-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/debian-8/conf/provision/ansible.cfg b/docker/php-official/8.4-alpine/conf/provision/ansible.cfg similarity index 100% rename from docker/base/debian-8/conf/provision/ansible.cfg rename to docker/php-official/8.4-alpine/conf/provision/ansible.cfg diff --git a/docker/base/debian-8/conf/provision/build.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/provision/build.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/debian-8/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/debian-8/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/base/debian-8/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/debian-8/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/7.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/base-app/debian-8/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/debian-8/conf/provision/bootstrap.d/20-app.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/7.1-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 similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/7.1-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 similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/20-setup-php.sh 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..4a348a38a --- /dev/null +++ b/docker/php-official/8.4-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/base/debian-8/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/debian-8/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php-official/8.4-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/base/debian-8/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/base/debian-8/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/debian-8/conf/provision/build.d/10-cleanup.sh rename to docker/php-official/8.4-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/debian-8/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/debian-8/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php-official/8.4-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh rename to docker/php-official/8.4-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/base/debian-8/conf/provision/roles/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/provision/roles/.gitkeep rename to docker/php-official/8.4-alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/debian-8/conf/provision/service.d/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/roles/.gitkeep similarity index 100% rename from docker/base/debian-8/conf/provision/service.d/.gitkeep rename to docker/php-official/8.4-alpine/conf/provision/roles/.gitkeep diff --git a/docker/base/debian-9/conf/etc/cron/.gitkeep b/docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/etc/cron/.gitkeep rename to docker/php-official/8.4-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/base/debian-8/conf/provision/service.d/cron.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/debian-8/conf/provision/service.d/cron.sh rename to docker/php-official/8.4-alpine/conf/provision/service.d/cron.sh diff --git a/docker/base/debian-8/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-8/conf/provision/service.d/dnsmasq.sh rename to docker/php-official/8.4-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/debian-8/conf/provision/service.d/postfix.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/debian-8/conf/provision/service.d/postfix.sh rename to docker/php-official/8.4-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/base/debian-8/conf/provision/service.d/ssh.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/debian-8/conf/provision/service.d/ssh.sh rename to docker/php-official/8.4-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/base/debian-8/conf/provision/service.d/syslog.sh b/docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/debian-8/conf/provision/service.d/syslog.sh rename to docker/php-official/8.4-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/base/debian-8/conf/provision/variables-webdevops.yml b/docker/php-official/8.4-alpine/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/debian-8/conf/provision/variables-webdevops.yml rename to docker/php-official/8.4-alpine/conf/provision/variables-webdevops.yml diff --git a/docker/base/debian-8/conf/provision/variables.yml b/docker/php-official/8.4-alpine/conf/provision/variables.yml similarity index 100% rename from docker/base/debian-8/conf/provision/variables.yml rename to docker/php-official/8.4-alpine/conf/provision/variables.yml diff --git a/docker/php-official/8.4/Dockerfile b/docker/php-official/8.4/Dockerfile new file mode 100644 index 000000000..eb2bc75e2 --- /dev/null +++ b/docker/php-official/8.4/Dockerfile @@ -0,0 +1,226 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 \ + && 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 \ + 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/base/debian-9/conf/VERSION b/docker/php-official/8.4/conf/VERSION similarity index 100% rename from docker/base/debian-9/conf/VERSION rename to docker/php-official/8.4/conf/VERSION diff --git a/docker/base/debian-9/conf/bin/bootstrap.sh b/docker/php-official/8.4/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/debian-9/conf/bin/bootstrap.sh rename to docker/php-official/8.4/conf/bin/bootstrap.sh diff --git a/docker/base/debian-9/conf/bin/config.sh b/docker/php-official/8.4/conf/bin/config.sh similarity index 100% rename from docker/base/debian-9/conf/bin/config.sh rename to docker/php-official/8.4/conf/bin/config.sh diff --git a/docker/base/debian-9/conf/bin/control.sh b/docker/php-official/8.4/conf/bin/control.sh similarity index 100% rename from docker/base/debian-9/conf/bin/control.sh rename to docker/php-official/8.4/conf/bin/control.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/debian-9/conf/bin/entrypoint.d/cli.sh rename to docker/php-official/8.4/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/debian-9/conf/bin/entrypoint.d/default.sh rename to docker/php-official/8.4/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/debian-9/conf/bin/entrypoint.d/noop.sh rename to docker/php-official/8.4/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/debian-9/conf/bin/entrypoint.d/root.sh rename to docker/php-official/8.4/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/debian-9/conf/bin/entrypoint.d/supervisord.sh rename to docker/php-official/8.4/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/php-official/8.4/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/debian-9/conf/bin/entrypoint.sh rename to docker/php-official/8.4/conf/bin/entrypoint.sh diff --git a/docker/base/debian-9/conf/bin/provision b/docker/php-official/8.4/conf/bin/provision similarity index 100% rename from docker/base/debian-9/conf/bin/provision rename to docker/php-official/8.4/conf/bin/provision diff --git a/docker/base/debian-9/conf/bin/provision.py b/docker/php-official/8.4/conf/bin/provision.py similarity index 100% rename from docker/base/debian-9/conf/bin/provision.py rename to docker/php-official/8.4/conf/bin/provision.py diff --git a/docker/base/debian-9/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/cron.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/debian-8/conf/bin/service.d/cron.sh b/docker/php-official/8.4/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/debian-8/conf/bin/service.d/cron.sh rename to docker/php-official/8.4/conf/bin/service.d/cron.sh diff --git a/docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/debian-9/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/dnsmasq.sh rename to docker/php-official/8.4/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/7.1/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 similarity index 100% rename from docker/php-official/7.1/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/7.1/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 similarity index 100% rename from docker/php-official/7.1/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php-official/8.4/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php-official/7.1/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.4/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/7.1/conf/bin/service.d/php-fpm.sh rename to docker/php-official/8.4/conf/bin/service.d/php-fpm.sh diff --git a/docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/debian-9/conf/bin/service.d/postfix.sh b/docker/php-official/8.4/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/postfix.sh rename to docker/php-official/8.4/conf/bin/service.d/postfix.sh diff --git a/docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/debian-9/conf/bin/service.d/ssh.sh b/docker/php-official/8.4/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/ssh.sh rename to docker/php-official/8.4/conf/bin/service.d/ssh.sh diff --git a/docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/7.3-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/debian-9/conf/bin/service.d/supervisor.sh b/docker/php-official/8.4/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/supervisor.sh rename to docker/php-official/8.4/conf/bin/service.d/supervisor.sh diff --git a/docker/base/debian-9/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 similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php-official/8.4/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/debian-9/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/syslog-ng.sh rename to docker/php-official/8.4/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/debian-9/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/container-file-auto-restore rename to docker/php-official/8.4/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.4/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/docker-ansible-install rename to docker/php-official/8.4/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/docker-cronjob rename to docker/php-official/8.4/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/7.1/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/7.1/conf/bin/usr-bin/docker-php-setting rename to docker/php-official/8.4/conf/bin/usr-bin/docker-php-setting diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-provision b/docker/php-official/8.4/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/docker-provision rename to docker/php-official/8.4/conf/bin/usr-bin/docker-provision diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service b/docker/php-official/8.4/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/docker-service rename to docker/php-official/8.4/conf/bin/usr-bin/docker-service diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/docker-service-disable rename to docker/php-official/8.4/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/debian-9/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/docker-service-enable rename to docker/php-official/8.4/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/debian-9/conf/bin/usr-bin/service b/docker/php-official/8.4/conf/bin/usr-bin/service similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/service rename to docker/php-official/8.4/conf/bin/usr-bin/service diff --git a/docker/base/debian-9/conf/bin/usr-bin/version-compare b/docker/php-official/8.4/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/debian-9/conf/bin/usr-bin/version-compare rename to docker/php-official/8.4/conf/bin/usr-bin/version-compare diff --git a/docker/base/debian-9/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.4/conf/etc/cron/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.4/conf/etc/cron/.gitkeep diff --git a/docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.4/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php-official/7.1/conf/etc/logrotate.d/php5-fpm rename to docker/php-official/8.4/conf/etc/logrotate.d/php5-fpm diff --git a/docker/base/debian-9/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/debian-9/conf/etc/logrotate.d/syslog-ng rename to docker/php-official/8.4/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.4/conf/etc/php/conf.d/.gitkeep diff --git a/docker/base/debian-9/conf/provision/build.d/.gitkeep b/docker/php-official/8.4/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/provision/build.d/.gitkeep rename to docker/php-official/8.4/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/7.1/conf/etc/php/php.ini b/docker/php-official/8.4/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/7.1/conf/etc/php/php.ini rename to docker/php-official/8.4/conf/etc/php/php.ini diff --git a/docker/php-official/7.1/conf/etc/php/php.webdevops.ini b/docker/php-official/8.4/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/7.1/conf/etc/php/php.webdevops.ini rename to docker/php-official/8.4/conf/etc/php/php.webdevops.ini diff --git a/docker/base/debian-9/conf/etc/supervisor.conf b/docker/php-official/8.4/conf/etc/supervisor.conf similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.conf rename to docker/php-official/8.4/conf/etc/supervisor.conf diff --git a/docker/base/debian-9/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.4/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/debian-9/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.4/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.d/cron.conf rename to docker/php-official/8.4/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php-official/8.4/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/7.1/conf/etc/supervisor.d/php-fpm.conf rename to docker/php-official/8.4/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/base/debian-9/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.d/postfix.conf rename to docker/php-official/8.4/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/debian-9/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.d/ssh.conf rename to docker/php-official/8.4/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/debian-9/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/debian-9/conf/etc/supervisor.d/syslog.conf rename to docker/php-official/8.4/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/debian-9/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php-official/8.4/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/debian-9/conf/provision/ansible.cfg b/docker/php-official/8.4/conf/provision/ansible.cfg similarity index 100% rename from docker/base/debian-9/conf/provision/ansible.cfg rename to docker/php-official/8.4/conf/provision/ansible.cfg diff --git a/docker/base/debian-9/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.4/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/debian-9/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/debian-9/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/7.1/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/base/debian-9/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/debian-9/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/base-app/debian-7/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/base-app/debian-7/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/7.1/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/base-app/debian-9/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/debian-9/conf/provision/bootstrap.d/20-app.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/7.1/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 similarity index 100% rename from docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/7.0/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/20-setup-php.sh 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..4a348a38a --- /dev/null +++ b/docker/php-official/8.4/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/base/debian-9/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/debian-9/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php-official/8.4/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/base/debian-9/conf/provision/roles/.gitkeep b/docker/php-official/8.4/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/provision/roles/.gitkeep rename to docker/php-official/8.4/conf/provision/build.d/.gitkeep diff --git a/docker/base/debian-9/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/debian-9/conf/provision/build.d/10-cleanup.sh rename to docker/php-official/8.4/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/debian-9/conf/provision/service.d/.gitkeep b/docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/debian-9/conf/provision/service.d/.gitkeep rename to docker/php-official/8.4/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/debian-9/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php-official/8.4/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/7.1/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php-official/8.4/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh rename to docker/php-official/8.4/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/base/ubuntu-12.04/conf/etc/cron/.gitkeep b/docker/php-official/8.4/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/cron/.gitkeep rename to docker/php-official/8.4/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.4/conf/provision/roles/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.4/conf/provision/roles/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.4/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.4/conf/provision/service.d/.gitkeep diff --git a/docker/base/debian-9/conf/provision/service.d/cron.sh b/docker/php-official/8.4/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/debian-9/conf/provision/service.d/cron.sh rename to docker/php-official/8.4/conf/provision/service.d/cron.sh diff --git a/docker/base/debian-9/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/debian-9/conf/provision/service.d/dnsmasq.sh rename to docker/php-official/8.4/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/debian-9/conf/provision/service.d/postfix.sh b/docker/php-official/8.4/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/debian-9/conf/provision/service.d/postfix.sh rename to docker/php-official/8.4/conf/provision/service.d/postfix.sh diff --git a/docker/base/debian-9/conf/provision/service.d/ssh.sh b/docker/php-official/8.4/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/debian-9/conf/provision/service.d/ssh.sh rename to docker/php-official/8.4/conf/provision/service.d/ssh.sh diff --git a/docker/base/debian-9/conf/provision/service.d/syslog.sh b/docker/php-official/8.4/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/debian-9/conf/provision/service.d/syslog.sh rename to docker/php-official/8.4/conf/provision/service.d/syslog.sh diff --git a/docker/base/debian-9/conf/provision/variables-webdevops.yml b/docker/php-official/8.4/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/debian-9/conf/provision/variables-webdevops.yml rename to docker/php-official/8.4/conf/provision/variables-webdevops.yml diff --git a/docker/base/debian-9/conf/provision/variables.yml b/docker/php-official/8.4/conf/provision/variables.yml similarity index 100% rename from docker/base/debian-9/conf/provision/variables.yml rename to docker/php-official/8.4/conf/provision/variables.yml diff --git a/docker/php-official/8.5-alpine/Dockerfile b/docker/php-official/8.5-alpine/Dockerfile new file mode 100644 index 000000000..4c3861bd4 --- /dev/null +++ b/docker/php-official/8.5-alpine/Dockerfile @@ -0,0 +1,247 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 \ + # 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/base/ubuntu-12.04/conf/VERSION b/docker/php-official/8.5-alpine/conf/VERSION similarity index 100% rename from docker/base/ubuntu-12.04/conf/VERSION rename to docker/php-official/8.5-alpine/conf/VERSION diff --git a/docker/base/ubuntu-12.04/conf/bin/bootstrap.sh b/docker/php-official/8.5-alpine/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/bootstrap.sh rename to docker/php-official/8.5-alpine/conf/bin/bootstrap.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/config.sh b/docker/php-official/8.5-alpine/conf/bin/config.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/config.sh rename to docker/php-official/8.5-alpine/conf/bin/config.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/control.sh b/docker/php-official/8.5-alpine/conf/bin/control.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/control.sh rename to docker/php-official/8.5-alpine/conf/bin/control.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/entrypoint.d/cli.sh rename to docker/php-official/8.5-alpine/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/entrypoint.d/default.sh rename to docker/php-official/8.5-alpine/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/entrypoint.d/noop.sh rename to docker/php-official/8.5-alpine/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/entrypoint.d/root.sh rename to docker/php-official/8.5-alpine/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/entrypoint.d/supervisord.sh rename to docker/php-official/8.5-alpine/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/php-official/8.5-alpine/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/entrypoint.sh rename to docker/php-official/8.5-alpine/conf/bin/entrypoint.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/provision b/docker/php-official/8.5-alpine/conf/bin/provision similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/provision rename to docker/php-official/8.5-alpine/conf/bin/provision diff --git a/docker/base/ubuntu-12.04/conf/bin/provision.py b/docker/php-official/8.5-alpine/conf/bin/provision.py similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/provision.py rename to docker/php-official/8.5-alpine/conf/bin/provision.py diff --git a/docker/base/ubuntu-12.04/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 similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/cron.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/php-official/7.3-alpine/conf/bin/service.d/cron.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh similarity index 100% rename from docker/php-official/7.3-alpine/conf/bin/service.d/cron.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/cron.sh diff --git a/docker/base/ubuntu-12.04/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 similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/dnsmasq.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/7.2-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 similarity index 100% rename from docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/7.2-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 similarity index 100% rename from docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/bin/service.d/php-fpm.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/php-fpm.sh diff --git a/docker/base/ubuntu-12.04/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 similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/postfix.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-12.04/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 similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/ssh.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/ssh.sh diff --git a/docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/7.3/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/supervisor.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-12.04/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 similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/service.d/syslog-ng.sh rename to docker/php-official/8.5-alpine/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/container-file-auto-restore rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-ansible-install rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-cronjob rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/7.2-alpine/conf/bin/usr-bin/docker-php-setting rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-php-setting diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-provision rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-provision diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-disable rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/docker-service-enable rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/service b/docker/php-official/8.5-alpine/conf/bin/usr-bin/service similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/service rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/service diff --git a/docker/base/ubuntu-12.04/conf/bin/usr-bin/version-compare b/docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/ubuntu-12.04/conf/bin/usr-bin/version-compare rename to docker/php-official/8.5-alpine/conf/bin/usr-bin/version-compare diff --git a/docker/base/ubuntu-12.04/conf/provision/build.d/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/build.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/etc/cron/.gitkeep diff --git a/docker/php-official/7.2-alpine/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.5-alpine/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php-official/7.2-alpine/conf/etc/logrotate.d/php5-fpm rename to docker/php-official/8.5-alpine/conf/etc/logrotate.d/php5-fpm diff --git a/docker/base/ubuntu-12.04/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/logrotate.d/syslog-ng rename to docker/php-official/8.5-alpine/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/etc/php/conf.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/7.2-alpine/conf/etc/php/php.ini b/docker/php-official/8.5-alpine/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/7.2-alpine/conf/etc/php/php.ini rename to docker/php-official/8.5-alpine/conf/etc/php/php.ini diff --git a/docker/php-official/7.2-alpine/conf/etc/php/php.webdevops.ini b/docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/7.2-alpine/conf/etc/php/php.webdevops.ini rename to docker/php-official/8.5-alpine/conf/etc/php/php.webdevops.ini diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/roles/.gitkeep b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/roles/.gitkeep rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.d/cron.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/7.2-alpine/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/7.2-alpine/conf/etc/supervisor.d/php-fpm.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.d/postfix.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.d/ssh.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/supervisor.d/syslog.conf rename to docker/php-official/8.5-alpine/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/ubuntu-12.04/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php-official/8.5-alpine/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/ubuntu-12.04/conf/provision/ansible.cfg b/docker/php-official/8.5-alpine/conf/provision/ansible.cfg similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/ansible.cfg rename to docker/php-official/8.5-alpine/conf/provision/ansible.cfg diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/service.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/php-official/7.3-alpine/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/7.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/ubuntu-12.04/conf/provision/bootstrap.d/20-app.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/7.2-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 similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/7.2-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 similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/7.3-alpine/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/20-setup-php.sh 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/base/ubuntu-12.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php-official/8.5-alpine/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/base/ubuntu-14.04/conf/etc/cron/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/cron/.gitkeep rename to docker/php-official/8.5-alpine/conf/provision/build.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/build.d/10-cleanup.sh rename to docker/php-official/8.5-alpine/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php-official/8.5-alpine/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh rename to docker/php-official/8.5-alpine/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/build.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/roles/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/build.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/provision/roles/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.5-alpine/conf/provision/service.d/.gitkeep diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/service.d/cron.sh rename to docker/php-official/8.5-alpine/conf/provision/service.d/cron.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/service.d/dnsmasq.sh rename to docker/php-official/8.5-alpine/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/service.d/postfix.sh rename to docker/php-official/8.5-alpine/conf/provision/service.d/postfix.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/service.d/ssh.sh rename to docker/php-official/8.5-alpine/conf/provision/service.d/ssh.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh b/docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/service.d/syslog.sh rename to docker/php-official/8.5-alpine/conf/provision/service.d/syslog.sh diff --git a/docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml b/docker/php-official/8.5-alpine/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/variables-webdevops.yml rename to docker/php-official/8.5-alpine/conf/provision/variables-webdevops.yml diff --git a/docker/base/ubuntu-12.04/conf/provision/variables.yml b/docker/php-official/8.5-alpine/conf/provision/variables.yml similarity index 100% rename from docker/base/ubuntu-12.04/conf/provision/variables.yml rename to docker/php-official/8.5-alpine/conf/provision/variables.yml diff --git a/docker/php-official/8.5/Dockerfile b/docker/php-official/8.5/Dockerfile new file mode 100644 index 000000000..bfda78378 --- /dev/null +++ b/docker/php-official/8.5/Dockerfile @@ -0,0 +1,225 @@ +#+++++++++++++++++++++++++++++++++++++++ +# 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 \ + && 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 \ + && 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/base/ubuntu-14.04/conf/VERSION b/docker/php-official/8.5/conf/VERSION similarity index 100% rename from docker/base/ubuntu-14.04/conf/VERSION rename to docker/php-official/8.5/conf/VERSION diff --git a/docker/base/ubuntu-14.04/conf/bin/bootstrap.sh b/docker/php-official/8.5/conf/bin/bootstrap.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/bootstrap.sh rename to docker/php-official/8.5/conf/bin/bootstrap.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/config.sh b/docker/php-official/8.5/conf/bin/config.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/config.sh rename to docker/php-official/8.5/conf/bin/config.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/control.sh b/docker/php-official/8.5/conf/bin/control.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/control.sh rename to docker/php-official/8.5/conf/bin/control.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/entrypoint.d/cli.sh rename to docker/php-official/8.5/conf/bin/entrypoint.d/cli.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/default.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/default.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/entrypoint.d/default.sh rename to docker/php-official/8.5/conf/bin/entrypoint.d/default.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/entrypoint.d/noop.sh rename to docker/php-official/8.5/conf/bin/entrypoint.d/noop.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/root.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/root.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/entrypoint.d/root.sh rename to docker/php-official/8.5/conf/bin/entrypoint.d/root.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh b/docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/entrypoint.d/supervisord.sh rename to docker/php-official/8.5/conf/bin/entrypoint.d/supervisord.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/php-official/8.5/conf/bin/entrypoint.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/entrypoint.sh rename to docker/php-official/8.5/conf/bin/entrypoint.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/provision b/docker/php-official/8.5/conf/bin/provision similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/provision rename to docker/php-official/8.5/conf/bin/provision diff --git a/docker/base/ubuntu-14.04/conf/bin/provision.py b/docker/php-official/8.5/conf/bin/provision.py similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/provision.py rename to docker/php-official/8.5/conf/bin/provision.py diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/cron.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/cron.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/cron.d/10-init.sh diff --git a/docker/base/debian-9/conf/bin/service.d/cron.sh b/docker/php-official/8.5/conf/bin/service.d/cron.sh similarity index 100% rename from docker/base/debian-9/conf/bin/service.d/cron.sh rename to docker/php-official/8.5/conf/bin/service.d/cron.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/dnsmasq.d/10-init.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh b/docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/dnsmasq.sh rename to docker/php-official/8.5/conf/bin/service.d/dnsmasq.sh diff --git a/docker/php-official/7.2/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 similarity index 100% rename from docker/php-official/7.2/conf/bin/service.d/php-fpm.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/php-fpm.d/10-init.sh diff --git a/docker/php-official/7.2/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 similarity index 100% rename from docker/php-official/7.2/conf/bin/service.d/php-fpm.d/11-clear-env.sh rename to docker/php-official/8.5/conf/bin/service.d/php-fpm.d/11-clear-env.sh diff --git a/docker/php-official/7.2/conf/bin/service.d/php-fpm.sh b/docker/php-official/8.5/conf/bin/service.d/php-fpm.sh similarity index 100% rename from docker/php-official/7.2/conf/bin/service.d/php-fpm.sh rename to docker/php-official/8.5/conf/bin/service.d/php-fpm.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/postfix.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/postfix.d/10-init.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh b/docker/php-official/8.5/conf/bin/service.d/postfix.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/postfix.sh rename to docker/php-official/8.5/conf/bin/service.d/postfix.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/ssh.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/ssh.d/10-init.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh b/docker/php-official/8.5/conf/bin/service.d/ssh.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/ssh.sh rename to docker/php-official/8.5/conf/bin/service.d/ssh.sh diff --git a/docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh b/docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh similarity index 100% rename from docker/php-apache-dev/7.4-alpine/conf/bin/service.d/blackfire-agent.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/supervisor.d/10-init.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.sh b/docker/php-official/8.5/conf/bin/service.d/supervisor.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/supervisor.sh rename to docker/php-official/8.5/conf/bin/service.d/supervisor.sh diff --git a/docker/base/ubuntu-14.04/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 similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.d/10-init.sh rename to docker/php-official/8.5/conf/bin/service.d/syslog-ng.d/10-init.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.sh b/docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/service.d/syslog-ng.sh rename to docker/php-official/8.5/conf/bin/service.d/syslog-ng.sh diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/container-file-auto-restore b/docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/container-file-auto-restore rename to docker/php-official/8.5/conf/bin/usr-bin/container-file-auto-restore diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-ansible-install b/docker/php-official/8.5/conf/bin/usr-bin/docker-ansible-install similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-ansible-install rename to docker/php-official/8.5/conf/bin/usr-bin/docker-ansible-install diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-cronjob b/docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-cronjob rename to docker/php-official/8.5/conf/bin/usr-bin/docker-cronjob diff --git a/docker/php-official/7.2/conf/bin/usr-bin/docker-php-setting b/docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting similarity index 100% rename from docker/php-official/7.2/conf/bin/usr-bin/docker-php-setting rename to docker/php-official/8.5/conf/bin/usr-bin/docker-php-setting diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision b/docker/php-official/8.5/conf/bin/usr-bin/docker-provision similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-provision rename to docker/php-official/8.5/conf/bin/usr-bin/docker-provision diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service b/docker/php-official/8.5/conf/bin/usr-bin/docker-service similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service rename to docker/php-official/8.5/conf/bin/usr-bin/docker-service diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable b/docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-disable rename to docker/php-official/8.5/conf/bin/usr-bin/docker-service-disable diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable b/docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/docker-service-enable rename to docker/php-official/8.5/conf/bin/usr-bin/docker-service-enable diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/service b/docker/php-official/8.5/conf/bin/usr-bin/service similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/service rename to docker/php-official/8.5/conf/bin/usr-bin/service diff --git a/docker/base/ubuntu-14.04/conf/bin/usr-bin/version-compare b/docker/php-official/8.5/conf/bin/usr-bin/version-compare similarity index 100% rename from docker/base/ubuntu-14.04/conf/bin/usr-bin/version-compare rename to docker/php-official/8.5/conf/bin/usr-bin/version-compare diff --git a/docker/base/ubuntu-14.04/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.5/conf/etc/cron/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.5/conf/etc/cron/.gitkeep diff --git a/docker/php-official/7.2/conf/etc/logrotate.d/php5-fpm b/docker/php-official/8.5/conf/etc/logrotate.d/php5-fpm similarity index 100% rename from docker/php-official/7.2/conf/etc/logrotate.d/php5-fpm rename to docker/php-official/8.5/conf/etc/logrotate.d/php5-fpm diff --git a/docker/base/ubuntu-14.04/conf/etc/logrotate.d/syslog-ng b/docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/logrotate.d/syslog-ng rename to docker/php-official/8.5/conf/etc/logrotate.d/syslog-ng diff --git a/docker/base/ubuntu-14.04/conf/provision/roles/.gitkeep b/docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/roles/.gitkeep rename to docker/php-official/8.5/conf/etc/php/conf.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep b/docker/php-official/8.5/conf/etc/php/fpm/.gitkeep similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/service.d/.gitkeep rename to docker/php-official/8.5/conf/etc/php/fpm/.gitkeep diff --git a/docker/php-official/7.2/conf/etc/php/php.ini b/docker/php-official/8.5/conf/etc/php/php.ini similarity index 100% rename from docker/php-official/7.2/conf/etc/php/php.ini rename to docker/php-official/8.5/conf/etc/php/php.ini diff --git a/docker/php-official/7.2/conf/etc/php/php.webdevops.ini b/docker/php-official/8.5/conf/etc/php/php.webdevops.ini similarity index 100% rename from docker/php-official/7.2/conf/etc/php/php.webdevops.ini rename to docker/php-official/8.5/conf/etc/php/php.webdevops.ini diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.conf b/docker/php-official/8.5/conf/etc/supervisor.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.conf rename to docker/php-official/8.5/conf/etc/supervisor.conf diff --git a/docker/base/ubuntu-15.04/conf/etc/cron/.gitkeep b/docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/etc/cron/.gitkeep rename to docker/php-official/8.5/conf/etc/supervisor.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/cron.conf b/docker/php-official/8.5/conf/etc/supervisor.d/cron.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.d/cron.conf rename to docker/php-official/8.5/conf/etc/supervisor.d/cron.conf diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf b/docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.d/dnsmasq.conf rename to docker/php-official/8.5/conf/etc/supervisor.d/dnsmasq.conf diff --git a/docker/php-official/7.2/conf/etc/supervisor.d/php-fpm.conf b/docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf similarity index 100% rename from docker/php-official/7.2/conf/etc/supervisor.d/php-fpm.conf rename to docker/php-official/8.5/conf/etc/supervisor.d/php-fpm.conf diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf b/docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.d/postfix.conf rename to docker/php-official/8.5/conf/etc/supervisor.d/postfix.conf diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf b/docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.d/ssh.conf rename to docker/php-official/8.5/conf/etc/supervisor.d/ssh.conf diff --git a/docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf b/docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/supervisor.d/syslog.conf rename to docker/php-official/8.5/conf/etc/supervisor.d/syslog.conf diff --git a/docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf b/docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf similarity index 100% rename from docker/base/ubuntu-14.04/conf/etc/syslog-ng/syslog-ng.conf rename to docker/php-official/8.5/conf/etc/syslog-ng/syslog-ng.conf diff --git a/docker/base/ubuntu-14.04/conf/provision/ansible.cfg b/docker/php-official/8.5/conf/provision/ansible.cfg similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/ansible.cfg rename to docker/php-official/8.5/conf/provision/ansible.cfg diff --git a/docker/base/ubuntu-15.04/conf/etc/supervisor.d/.gitkeep b/docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/etc/supervisor.d/.gitkeep rename to docker/php-official/8.5/conf/provision/bootstrap.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-entrypoint.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-entrypoint.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/10-entrypoint.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-permissions.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-permissions.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/10-permissions.sh diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/10-php-init.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh similarity index 100% rename from docker/php-official/7.2/conf/provision/bootstrap.d/10-php-init.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/10-php-init.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-supervisor.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/bootstrap.d/10-supervisor.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/10-supervisor.sh diff --git a/docker/base-app/debian-8/conf/provision/bootstrap.d/10-user-application.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh similarity index 100% rename from docker/base-app/debian-8/conf/provision/bootstrap.d/10-user-application.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/10-user-application.sh diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/11-php-conf.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh similarity index 100% rename from docker/php-official/7.2/conf/provision/bootstrap.d/11-php-conf.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/11-php-conf.sh diff --git a/docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/20-app.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh similarity index 100% rename from docker/base-app/ubuntu-14.04/conf/provision/bootstrap.d/20-app.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/20-app.sh diff --git a/docker/php-official/7.2/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 similarity index 100% rename from docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm-pool.sh diff --git a/docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh similarity index 100% rename from docker/php-official/7.2/conf/provision/bootstrap.d/20-setup-php-fpm.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php-fpm.sh diff --git a/docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh similarity index 100% rename from docker/php-official/7.1/conf/provision/bootstrap.d/20-setup-php.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/20-setup-php.sh 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/base/ubuntu-14.04/conf/provision/bootstrap.d/90-cleanup.sh b/docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/bootstrap.d/90-cleanup.sh rename to docker/php-official/8.5/conf/provision/bootstrap.d/90-cleanup.sh diff --git a/docker/base/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep b/docker/php-official/8.5/conf/provision/build.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/provision/bootstrap.d/.gitkeep rename to docker/php-official/8.5/conf/provision/build.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/build.d/10-cleanup.sh b/docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/build.d/10-cleanup.sh rename to docker/php-official/8.5/conf/provision/build.d/10-cleanup.sh diff --git a/docker/base/ubuntu-15.04/conf/provision/build.d/.gitkeep b/docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/provision/build.d/.gitkeep rename to docker/php-official/8.5/conf/provision/entrypoint.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh b/docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/entrypoint.d/05-permissions.sh rename to docker/php-official/8.5/conf/provision/entrypoint.d/05-permissions.sh diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php-fpm.sh b/docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh similarity index 100% rename from docker/php-official/7.2/conf/provision/entrypoint.d/20-php-fpm.sh rename to docker/php-official/8.5/conf/provision/entrypoint.d/20-php-fpm.sh diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh similarity index 100% rename from docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh rename to docker/php-official/8.5/conf/provision/entrypoint.d/20-php.sh diff --git a/docker/base/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep b/docker/php-official/8.5/conf/provision/onbuild.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/provision/entrypoint.d/.gitkeep rename to docker/php-official/8.5/conf/provision/onbuild.d/.gitkeep diff --git a/docker/base/ubuntu-15.04/conf/provision/onbuild.d/.gitkeep b/docker/php-official/8.5/conf/provision/roles/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/provision/onbuild.d/.gitkeep rename to docker/php-official/8.5/conf/provision/roles/.gitkeep diff --git a/docker/base/ubuntu-15.04/conf/provision/roles/.gitkeep b/docker/php-official/8.5/conf/provision/service.d/.gitkeep similarity index 100% rename from docker/base/ubuntu-15.04/conf/provision/roles/.gitkeep rename to docker/php-official/8.5/conf/provision/service.d/.gitkeep diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh b/docker/php-official/8.5/conf/provision/service.d/cron.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/service.d/cron.sh rename to docker/php-official/8.5/conf/provision/service.d/cron.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh b/docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/service.d/dnsmasq.sh rename to docker/php-official/8.5/conf/provision/service.d/dnsmasq.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh b/docker/php-official/8.5/conf/provision/service.d/postfix.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/service.d/postfix.sh rename to docker/php-official/8.5/conf/provision/service.d/postfix.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh b/docker/php-official/8.5/conf/provision/service.d/ssh.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/service.d/ssh.sh rename to docker/php-official/8.5/conf/provision/service.d/ssh.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh b/docker/php-official/8.5/conf/provision/service.d/syslog.sh similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/service.d/syslog.sh rename to docker/php-official/8.5/conf/provision/service.d/syslog.sh diff --git a/docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml b/docker/php-official/8.5/conf/provision/variables-webdevops.yml similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/variables-webdevops.yml rename to docker/php-official/8.5/conf/provision/variables-webdevops.yml diff --git a/docker/base/ubuntu-14.04/conf/provision/variables.yml b/docker/php-official/8.5/conf/provision/variables.yml similarity index 100% rename from docker/base/ubuntu-14.04/conf/provision/variables.yml rename to docker/php-official/8.5/conf/provision/variables.yml 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/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..bce304294 --- /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/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/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/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 b8f0e3063..000000000 Binary files a/docker/samson-deployment/latest/web/logo_light.png and /dev/null differ diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile deleted file mode 100644 index c0d0cbe1c..000000000 --- a/docker/sphinx/latest/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -#+++++++++++++++++++++++++++++++++++++++ -# Dockerfile for webdevops/sphinx:latest -# -- automatically generated -- -#+++++++++++++++++++++++++++++++++++++++ - -FROM webdevops/bootstrap:alpine - -RUN set -x \ - && 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 \ - && docker-run-bootstrap \ - && docker-image-cleanup diff --git a/docker/sphinx/latest/Dockerfile.jinja2 b/docker/sphinx/latest/Dockerfile.jinja2 deleted file mode 100644 index 6e2ad14bd..000000000 --- a/docker/sphinx/latest/Dockerfile.jinja2 +++ /dev/null @@ -1,6 +0,0 @@ -{{ docker.from("bootstrap","alpine") }} - -RUN set -x \ - {{ sphinx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} diff --git a/docker/sphinx/latest/README.md b/docker/sphinx/latest/README.md deleted file mode 100644 index fc09ce484..000000000 --- a/docker/sphinx/latest/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# Postfix container layout - -## 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') - -## Example usage - -Running a sphinx-autobuild server for Live preview. - -```bash -docker run -t -i --rm -p 8080:8000 -v :/opt/docs webdevops/sphinx sphinx-autobuild -H 0.0.0.0 /opt/docs html -``` diff --git a/docker/toolbox/latest/Dockerfile b/docker/toolbox/latest/Dockerfile index a5cff009c..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/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.$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" \ 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/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/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 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/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. 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..c010499b2 100644 --- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst +++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst @@ -1,18 +1,28 @@ ====================== =================================== =============== 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 -``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.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 +``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 ``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 +``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 @@ -27,7 +37,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/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 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/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; 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..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,8 +1,13 @@ #!/usr/bin/env bash +if [ $IMAGE_FAMILY == "Alpine" ]; then + echo "Skipping ionCube installation on Alpine" + return +fi + 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/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/php.jinja2 b/template/Dockerfile/images/php.jinja2 index c933adf4c..3d0f56558 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,14 @@ # Libraries libvips42 \ librabbitmq4 \ +{%- if distribution == 'bookworm' %} + libldap-2.5-0 \ +{%- else %} libldap-2.4-2 \ - libxslt1.1 \ zlibc \ +{%- endif %} + libxslt1.1 \ + libldap-common \ zlib1g \ libpq5 \ libpng16-16 \ @@ -49,6 +54,7 @@ libvips-dev \ librabbitmq-dev \ libmagick++-dev \ + libgmp-dev \ # Install guetzli && wget https://github.com/google/guetzli/archive/master.zip \ && unzip master.zip \ @@ -56,107 +62,73 @@ && 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' %} - && 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 \ + && 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/ \ + && 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 == '8.0' or version == '8.1' or version == '8.2' %} amqp \ imagick \ -{%- endif %} + ffi \ bz2 \ calendar \ exif \ + ftp \ + gmp \ intl \ 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 \ -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} - hash \ {%- endif %} pcntl \ pdo_mysql \ pdo_pgsql \ pgsql \ soap \ - sockets \ -{%- if version != '8.1' and version != '8.2' %} - tokenizer \ -{%- endif %} + sockets \ sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' %} - xmlrpc \ -{%- endif %} xsl \ zip \ gd \ - gettext \ +{%- if version != '8.5' %} opcache \ -{%- 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' %} +{%- endif %} && 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 \ && 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 \ -{%- 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 \ @@ -176,6 +148,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 \ @@ -202,10 +175,12 @@ libintl \ libpq \ libxslt \ + libgomp \ libzip \ libmemcached \ yaml \ # Build dependencies + linux-headers \ autoconf \ g++ \ make \ @@ -213,6 +188,7 @@ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -225,7 +201,11 @@ icu-dev \ postgresql-dev \ libxml2-dev \ + {%- if version == '8.1' %} ldb-dev \ + {%- else %} + samba-dev \ + {%- endif %} pcre-dev \ libxslt-dev \ libzip-dev \ @@ -240,38 +220,34 @@ # 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' %} && 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 \ - && 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 \ +{%- endif %} && docker-php-ext-install \ bcmath \ bz2 \ calendar \ exif \ -{%- if version == '7.4' or version == '8.0' or version == '8.1' or version == '8.2' %} + ftp \ + gmp \ ffi \ imagick \ amqp \ -{%- endif %} intl \ gettext \ ldap \ mysqli \ +{%- if version != '8.4' and version != '8.5' %} imap \ -{%- if version != '7.4' and version != '8.0' and version != '8.1' and version != '8.2' %} - hash \ {%- endif %} pcntl \ pdo_mysql \ @@ -279,35 +255,31 @@ pgsql \ soap \ sockets \ -{%- if version != '8.1' and version != '8.2' %} - tokenizer \ -{%- endif %} sysvmsg \ sysvsem \ sysvshm \ shmop \ -{%- if version != '8.0' and version != '8.1' and version != '8.2' %} - xmlrpc \ -{%- endif %} 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' %} # 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' %} && 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 \ @@ -315,40 +287,26 @@ && pecl install xmlrpc-1.0.0RC3 \ && docker-php-ext-enable \ apcu \ + excimer \ + opentelemetry \ + protobuf \ vips \ yaml \ redis \ 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 \ + linux-headers \ g++ \ make \ libtool \ pcre-dev \ gettext-dev \ freetype-dev \ + gmp-dev \ libjpeg-turbo-dev \ libpng-dev \ vips-dev \ @@ -361,7 +319,11 @@ icu-dev \ postgresql-dev \ libxml2-dev \ + {%- if version == '8.1' %} ldb-dev \ + {%- else %} + samba-dev \ + {%- endif %} pcre-dev \ libxslt-dev \ libzip-dev \ @@ -376,20 +338,12 @@ {% 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 - \ && 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' %} && pecl install xdebug \ - {%- elif version == '7.0' or version == '7.1' %} - && pecl install xdebug-2.8.1 \ - {%- else %} - && pecl install xdebug \ - {%- endif %} && docker-php-ext-enable xdebug \ {{ services.phpDev() }} {%- endmacro %} @@ -399,18 +353,14 @@ && bash -c "$(curl -L https://installer.blackfire.io/installer.sh)" \ && blackfire php:install \ && apk-install \ + linux-headers \ 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 \ - {%- else %} && pecl install xdebug \ - {%- endif %} && apk del -f --purge \ autoconf \ + linux-headers \ g++ \ make \ && docker-php-ext-enable xdebug \ 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 -- diff --git a/template/Dockerfile/tools.jinja2 b/template/Dockerfile/tools.jinja2 index dd4227588..b15ac5b8b 100644 --- a/template/Dockerfile/tools.jinja2 +++ b/template/Dockerfile/tools.jinja2 @@ -1,14 +1,14 @@ -{% 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.$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" \ 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 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-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" 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"