diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5523585ea..8bd08c4a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,10 +28,10 @@ stages: - 'cd docker/bootstrap/alpine' - 'docker build --no-cache -t webdevops/bootstrap:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_65969e81a9fbe7.15220176' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9fbe7.15220176' + - 'echo "FROM webdevops/bootstrap:alpine" >> Dockerfile_667f1a78e986a1.43610572' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e986a1.43610572' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYTlmYmU3LjE1MjIwMTc2In0= Dockerfile_65969e81a9fbe7.15220176' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk4NmExLjQzNjEwNTcyIn0= Dockerfile_667f1a78e986a1.43610572' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:alpine --config bootstrap/test.yaml --config bootstrap/alpine/test.yaml' - 'docker push webdevops/bootstrap:alpine' @@ -51,10 +51,10 @@ stages: - 'cd docker/base/alpine' - 'docker build --no-cache -t webdevops/base:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:alpine" >> Dockerfile_65969e81a9fe36.86754873' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9fe36.86754873' + - 'echo "FROM webdevops/base:alpine" >> Dockerfile_667f1a78e98b03.36105140' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98b03.36105140' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWE5ZmUzNi44Njc1NDg3MyJ9 Dockerfile_65969e81a9fe36.86754873' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6YWxwaW5lIiwiRE9DS0VSX1RBRyI6ImFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OGIwMy4zNjEwNTE0MCJ9 Dockerfile_667f1a78e98b03.36105140' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:alpine --config base/test.yaml --config base/alpine/test.yaml' - 'docker push webdevops/base:alpine' @@ -74,10 +74,10 @@ stages: - 'cd docker/nginx/alpine' - 'docker build --no-cache -t webdevops/nginx:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_65969e81a9ffb3.78311157' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81a9ffb3.78311157' + - 'echo "FROM webdevops/nginx:alpine" >> Dockerfile_667f1a78e98e48.66717548' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e98e48.66717548' - 'bundle install' - - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhOWZmYjMuNzgzMTExNTcifQ== Dockerfile_65969e81a9ffb3.78311157' + - 'bash serverspec.sh spec/docker/nginx_spec.rb webdevops/nginx:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL25naW54OmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOThlNDguNjY3MTc1NDgifQ== Dockerfile_667f1a78e98e48.66717548' - 'docker push webdevops/nginx:alpine' - 'docker tag webdevops/nginx:alpine $CI_REGISTRY_IMAGE/nginx:alpine' - 'docker push $CI_REGISTRY_IMAGE/nginx:alpine' @@ -95,10 +95,10 @@ stages: - 'cd docker/apache/alpine' - 'docker build --no-cache -t webdevops/apache:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_65969e81aa0137.94179778' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0137.94179778' + - 'echo "FROM webdevops/apache:alpine" >> Dockerfile_667f1a78e99111.96614651' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99111.96614651' - 'bundle install' - - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEwMTM3Ljk0MTc5Nzc4In0= Dockerfile_65969e81aa0137.94179778' + - 'bash serverspec.sh spec/docker/apache_spec.rb webdevops/apache:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2FwYWNoZTphbHBpbmUiLCJET0NLRVJfVEFHIjoiYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IiIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5MTExLjk2NjE0NjUxIn0= Dockerfile_667f1a78e99111.96614651' - 'docker push webdevops/apache:alpine' - 'docker tag webdevops/apache:alpine $CI_REGISTRY_IMAGE/apache:alpine' - 'docker push $CI_REGISTRY_IMAGE/apache:alpine' @@ -116,10 +116,10 @@ stages: - 'cd docker/base-app/alpine' - 'docker build --no-cache -t webdevops/base-app:alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_65969e81aa0323.30434210' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0323.30434210' + - 'echo "FROM webdevops/base-app:alpine" >> Dockerfile_667f1a78e993c5.66917319' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e993c5.66917319' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTAzMjMuMzA0MzQyMTAifQ== Dockerfile_65969e81aa0323.30434210' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOmFscGluZSIsIkRPQ0tFUl9UQUciOiJhbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTkzYzUuNjY5MTczMTkifQ== Dockerfile_667f1a78e993c5.66917319' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:alpine --config base-app/test.yaml --config base-app/alpine/test.yaml' - 'docker push webdevops/base-app:alpine' @@ -139,10 +139,10 @@ stages: - 'cd docker/bootstrap/ubuntu-22.04' - 'docker build --no-cache -t webdevops/bootstrap:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_65969e81aa05b0.92099237' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa05b0.92099237' + - 'echo "FROM webdevops/bootstrap:ubuntu-22.04" >> Dockerfile_667f1a78e996a9.79805936' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e996a9.79805936' - 'bundle install' - - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTA1YjAuOTIwOTkyMzcifQ== Dockerfile_65969e81aa05b0.92099237' + - 'bash serverspec.sh spec/docker/bootstrap_spec.rb webdevops/bootstrap:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jvb3RzdHJhcDp1YnVudHUtMjIuMDQiLCJET0NLRVJfVEFHIjoidWJ1bnR1LTIyLjA0IiwiT1NfRkFNSUxZIjoidWJ1bnR1IiwiT1NfVkVSU0lPTiI6IjIyLjA0IiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOTk2YTkuNzk4MDU5MzYifQ== Dockerfile_667f1a78e996a9.79805936' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/bootstrap:ubuntu-22.04 --config bootstrap/test.yaml' - 'docker push webdevops/bootstrap:ubuntu-22.04' @@ -164,10 +164,10 @@ stages: - 'cd docker/base/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_65969e81aa0759.94045219' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0759.94045219' + - 'echo "FROM webdevops/base:ubuntu-22.04" >> Dockerfile_667f1a78e99961.24720922' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99961.24720922' - 'bundle install' - - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEwNzU5Ljk0MDQ1MjE5In0= Dockerfile_65969e81aa0759.94045219' + - 'bash serverspec.sh spec/docker/base_spec.rb webdevops/base:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2U6dWJ1bnR1LTIyLjA0IiwiRE9DS0VSX1RBRyI6InVidW50dS0yMi4wNCIsIk9TX0ZBTUlMWSI6InVidW50dSIsIk9TX1ZFUlNJT04iOiIyMi4wNCIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTk5OTYxLjI0NzIwOTIyIn0= Dockerfile_667f1a78e99961.24720922' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base:ubuntu-22.04 --config base/test.yaml' - 'docker push webdevops/base:ubuntu-22.04' @@ -189,10 +189,10 @@ stages: - 'cd docker/base-app/ubuntu-22.04' - 'docker build --no-cache -t webdevops/base-app:ubuntu-22.04 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_65969e81aa08b7.18673792' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa08b7.18673792' + - 'echo "FROM webdevops/base-app:ubuntu-22.04" >> Dockerfile_667f1a78e99c11.48948582' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e99c11.48948582' - 'bundle install' - - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMDhiNy4xODY3Mzc5MiJ9 Dockerfile_65969e81aa08b7.18673792' + - 'bash serverspec.sh spec/docker/base-app_spec.rb webdevops/base-app:ubuntu-22.04 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL2Jhc2UtYXBwOnVidW50dS0yMi4wNCIsIkRPQ0tFUl9UQUciOiJ1YnVudHUtMjIuMDQiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5OWMxMS40ODk0ODU4MiJ9 Dockerfile_667f1a78e99c11.48948582' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/base-app:ubuntu-22.04 --config base-app/test.yaml' - 'docker push webdevops/base-app:ubuntu-22.04' @@ -230,10 +230,10 @@ stages: - 'cd docker/vsftp/latest' - 'docker build --no-cache -t webdevops/vsftp:latest .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_65969e81aa0ea2.54872229' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa0ea2.54872229' + - 'echo "FROM webdevops/vsftp:latest" >> Dockerfile_667f1a78e9a425.86024047' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9a425.86024047' - 'bundle install' - - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMGVhMi41NDg3MjIyOSJ9 Dockerfile_65969e81aa0ea2.54872229' + - 'bash serverspec.sh spec/docker/vsftp_spec.rb webdevops/vsftp:latest eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3ZzZnRwOmxhdGVzdCIsIkRPQ0tFUl9UQUciOiJsYXRlc3QiLCJPU19GQU1JTFkiOiJ1YnVudHUiLCJPU19WRVJTSU9OIjoiMjIuMDQiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5YTQyNS44NjAyNDA0NyJ9 Dockerfile_667f1a78e9a425.86024047' - 'docker push webdevops/vsftp:latest' - 'docker tag webdevops/vsftp:latest $CI_REGISTRY_IMAGE/vsftp:latest' - 'docker push $CI_REGISTRY_IMAGE/vsftp:latest' @@ -267,10 +267,10 @@ stages: - 'cd docker/php-official/8.2' - 'docker build --no-cache -t webdevops/php:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2" >> Dockerfile_65969e81aa22e5.03607832' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa22e5.03607832' + - 'echo "FROM webdevops/php:8.2" >> Dockerfile_667f1a78e9c787.18338734' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9c787.18338734' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyMmU1LjAzNjA3ODMyIn0= Dockerfile_65969e81aa22e5.03607832' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljNzg3LjE4MzM4NzM0In0= Dockerfile_667f1a78e9c787.18338734' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2 --config php/test.yaml' - 'docker push webdevops/php:8.2' @@ -292,10 +292,10 @@ stages: - 'cd docker/php-dev/8.2' - 'docker build --no-cache -t webdevops/php-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_65969e81aa2474.20871582' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2474.20871582' + - 'echo "FROM webdevops/php-dev:8.2" >> Dockerfile_667f1a78e9ca18.84839188' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ca18.84839188' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjQ3NC4yMDg3MTU4MiJ9 Dockerfile_65969e81aa2474.20871582' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2ExOC44NDgzOTE4OCJ9 Dockerfile_667f1a78e9ca18.84839188' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2' @@ -315,10 +315,10 @@ stages: - 'cd docker/php-nginx/8.2' - 'docker build --no-cache -t webdevops/php-nginx:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_65969e81aa25f1.32995116' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa25f1.32995116' + - 'echo "FROM webdevops/php-nginx:8.2" >> Dockerfile_667f1a78e9cc28.80853000' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cc28.80853000' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyNWYxLjMyOTk1MTE2In0= Dockerfile_65969e81aa25f1.32995116' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjIiLCJET0NLRVJfVEFHIjoiOC4yIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTljYzI4LjgwODUzMDAwIn0= Dockerfile_667f1a78e9cc28.80853000' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2' @@ -338,10 +338,10 @@ stages: - 'cd docker/php-nginx-dev/8.2' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_65969e81aa2798.35883166' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2798.35883166' + - 'echo "FROM webdevops/php-nginx-dev:8.2" >> Dockerfile_667f1a78e9cf03.94640741' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9cf03.94640741' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjc5OC4zNTg4MzE2NiJ9 Dockerfile_65969e81aa2798.35883166' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5Y2YwMy45NDY0MDc0MSJ9 Dockerfile_667f1a78e9cf03.94640741' - 'docker push webdevops/php-nginx-dev:8.2' - 'docker tag webdevops/php-nginx-dev:8.2 $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2' @@ -359,10 +359,10 @@ stages: - 'cd docker/php-apache/8.2' - 'docker build --no-cache -t webdevops/php-apache:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_65969e81aa28e3.42650509' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa28e3.42650509' + - 'echo "FROM webdevops/php-apache:8.2" >> Dockerfile_667f1a78e9d122.49340362' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d122.49340362' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMjhlMy40MjY1MDUwOSJ9 Dockerfile_65969e81aa28e3.42650509' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yIiwiRE9DS0VSX1RBRyI6IjguMiIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDEyMi40OTM0MDM2MiJ9 Dockerfile_667f1a78e9d122.49340362' - 'docker push webdevops/php-apache:8.2' - 'docker tag webdevops/php-apache:8.2 $CI_REGISTRY_IMAGE/php-apache:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2' @@ -380,10 +380,10 @@ stages: - 'cd docker/php-apache-dev/8.2' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_65969e81aa2a56.91619924' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2a56.91619924' + - 'echo "FROM webdevops/php-apache-dev:8.2" >> Dockerfile_667f1a78e9d325.79477395' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d325.79477395' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTJhNTYuOTE2MTk5MjQifQ== Dockerfile_65969e81aa2a56.91619924' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMiIsIkRPQ0tFUl9UQUciOiI4LjIiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWQzMjUuNzk0NzczOTUifQ== Dockerfile_667f1a78e9d325.79477395' - 'docker push webdevops/php-apache-dev:8.2' - 'docker tag webdevops/php-apache-dev:8.2 $CI_REGISTRY_IMAGE/php-apache-dev:8.2' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2' @@ -401,10 +401,10 @@ stages: - 'cd docker/php-official/8.3' - 'docker build --no-cache -t webdevops/php:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3" >> Dockerfile_65969e81aa2c00.96913904' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2c00.96913904' + - 'echo "FROM webdevops/php:8.3" >> Dockerfile_667f1a78e9d503.69654040' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d503.69654040' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEyYzAwLjk2OTEzOTA0In0= Dockerfile_65969e81aa2c00.96913904' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkNTAzLjY5NjU0MDQwIn0= Dockerfile_667f1a78e9d503.69654040' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3 --config php/test.yaml' - 'docker push webdevops/php:8.3' @@ -426,10 +426,10 @@ stages: - 'cd docker/php-dev/8.3' - 'docker build --no-cache -t webdevops/php-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_65969e81aa2dc5.21195258' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa2dc5.21195258' + - 'echo "FROM webdevops/php-dev:8.3" >> Dockerfile_667f1a78e9d745.04130984' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d745.04130984' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMmRjNS4yMTE5NTI1OCJ9 Dockerfile_65969e81aa2dc5.21195258' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZDc0NS4wNDEzMDk4NCJ9 Dockerfile_667f1a78e9d745.04130984' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3' @@ -449,10 +449,10 @@ stages: - 'cd docker/php-nginx/8.3' - 'docker build --no-cache -t webdevops/php-nginx:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_65969e81aa30f3.78486684' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa30f3.78486684' + - 'echo "FROM webdevops/php-nginx:8.3" >> Dockerfile_667f1a78e9d9b6.72303514' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9d9b6.72303514' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWEzMGYzLjc4NDg2Njg0In0= Dockerfile_65969e81aa30f3.78486684' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMiLCJET0NLRVJfVEFHIjoiOC4zIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZTlkOWI2LjcyMzAzNTE0In0= Dockerfile_667f1a78e9d9b6.72303514' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3' @@ -472,10 +472,10 @@ stages: - 'cd docker/php-nginx-dev/8.3' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_65969e81aa32b7.36398353' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa32b7.36398353' + - 'echo "FROM webdevops/php-nginx-dev:8.3" >> Dockerfile_667f1a78e9dc76.11125850' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9dc76.11125850' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMzJiNy4zNjM5ODM1MyJ9 Dockerfile_65969e81aa32b7.36398353' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGM3Ni4xMTEyNTg1MCJ9 Dockerfile_667f1a78e9dc76.11125850' - 'docker push webdevops/php-nginx-dev:8.3' - 'docker tag webdevops/php-nginx-dev:8.3 $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3' @@ -493,10 +493,10 @@ stages: - 'cd docker/php-apache/8.3' - 'docker build --no-cache -t webdevops/php-apache:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_65969e81aa3413.33167586' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa3413.33167586' + - 'echo "FROM webdevops/php-apache:8.3" >> Dockerfile_667f1a78e9de76.40274417' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9de76.40274417' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhMzQxMy4zMzE2NzU4NiJ9 Dockerfile_65969e81aa3413.33167586' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zIiwiRE9DS0VSX1RBRyI6IjguMyIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZGU3Ni40MDI3NDQxNyJ9 Dockerfile_667f1a78e9de76.40274417' - 'docker push webdevops/php-apache:8.3' - 'docker tag webdevops/php-apache:8.3 $CI_REGISTRY_IMAGE/php-apache:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3' @@ -514,10 +514,10 @@ stages: - 'cd docker/php-apache-dev/8.3' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_65969e81aa3595.03706036' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa3595.03706036' + - 'echo "FROM webdevops/php-apache-dev:8.3" >> Dockerfile_667f1a78e9e033.60561999' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9e033.60561999' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTM1OTUuMDM3MDYwMzYifQ== Dockerfile_65969e81aa3595.03706036' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMyIsIkRPQ0tFUl9UQUciOiI4LjMiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWUwMzMuNjA1NjE5OTkifQ== Dockerfile_667f1a78e9e033.60561999' - 'docker push webdevops/php-apache-dev:8.3' - 'docker tag webdevops/php-apache-dev:8.3 $CI_REGISTRY_IMAGE/php-apache-dev:8.3' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3' @@ -535,10 +535,10 @@ stages: - 'cd docker/php-official/8.2-alpine' - 'docker build --no-cache -t webdevops/php:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_65969e81aa4c48.63440216' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4c48.63440216' + - 'echo "FROM webdevops/php:8.2-alpine" >> Dockerfile_667f1a78e9fd69.08017350' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9fd69.08017350' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNGM0OC42MzQ0MDIxNiJ9 Dockerfile_65969e81aa4c48.63440216' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGU5ZmQ2OS4wODAxNzM1MCJ9 Dockerfile_667f1a78e9fd69.08017350' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.2-alpine --config php/test.yaml' - 'docker push webdevops/php:8.2-alpine' @@ -560,10 +560,10 @@ stages: - 'cd docker/php-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_65969e81aa4de7.33195445' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4de7.33195445' + - 'echo "FROM webdevops/php-dev:8.2-alpine" >> Dockerfile_667f1a78e9ff80.10051609' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78e9ff80.10051609' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTRkZTcuMzMxOTU0NDUifQ== Dockerfile_65969e81aa4de7.33195445' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlOWZmODAuMTAwNTE2MDkifQ== Dockerfile_667f1a78e9ff80.10051609' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.2-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.2-alpine' @@ -583,10 +583,10 @@ stages: - 'cd docker/php-nginx/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_65969e81aa4f93.58890182' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa4f93.58890182' + - 'echo "FROM webdevops/php-nginx:8.2-alpine" >> Dockerfile_667f1a78ea0223.80714897' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0223.80714897' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNGY5My41ODg5MDE4MiJ9 Dockerfile_65969e81aa4f93.58890182' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjItYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMi1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhMDIyMy44MDcxNDg5NyJ9 Dockerfile_667f1a78ea0223.80714897' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.2-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.2-alpine' @@ -606,10 +606,10 @@ stages: - 'cd docker/php-nginx-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_65969e81aa5164.98447807' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5164.98447807' + - 'echo "FROM webdevops/php-nginx-dev:8.2-alpine" >> Dockerfile_667f1a78ea0482.28125239' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0482.28125239' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTUxNjQuOTg0NDc4MDcifQ== Dockerfile_65969e81aa5164.98447807' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA0ODIuMjgxMjUyMzkifQ== Dockerfile_667f1a78ea0482.28125239' - 'docker push webdevops/php-nginx-dev:8.2-alpine' - 'docker tag webdevops/php-nginx-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.2-alpine' @@ -617,27 +617,6 @@ stages: - aws needs: - 'webdevops/php-nginx:8.2-alpine' -'webdevops/php-nginx-dev:8.3-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.3-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_65969e81aa52c4.21199013' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa52c4.21199013' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTUyYzQuMjExOTkwMTMifQ== Dockerfile_65969e81aa52c4.21199013' - - 'docker push webdevops/php-nginx-dev:8.3-alpine' - - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.2-alpine' 'webdevops/php-apache:8.2-alpine': stage: level3 before_script: @@ -648,10 +627,10 @@ stages: - 'cd docker/php-apache/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_65969e81aa5416.86506770' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5416.86506770' + - 'echo "FROM webdevops/php-apache:8.2-alpine" >> Dockerfile_667f1a78ea06f5.64008708' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea06f5.64008708' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTU0MTYuODY1MDY3NzAifQ== Dockerfile_65969e81aa5416.86506770' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4yLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjItYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTA2ZjUuNjQwMDg3MDgifQ== Dockerfile_667f1a78ea06f5.64008708' - 'docker push webdevops/php-apache:8.2-alpine' - 'docker tag webdevops/php-apache:8.2-alpine $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.2-alpine' @@ -669,10 +648,10 @@ stages: - 'cd docker/php-apache-dev/8.2-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.2-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_65969e81aa5562.54359563' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa5562.54359563' + - 'echo "FROM webdevops/php-apache-dev:8.2-alpine" >> Dockerfile_667f1a78ea0940.45216278' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea0940.45216278' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE1NTYyLjU0MzU5NTYzIn0= Dockerfile_65969e81aa5562.54359563' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.2-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMi1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4yLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWEwOTQwLjQ1MjE2Mjc4In0= Dockerfile_667f1a78ea0940.45216278' - 'docker push webdevops/php-apache-dev:8.2-alpine' - 'docker tag webdevops/php-apache-dev:8.2-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.2-alpine' @@ -680,140 +659,6 @@ stages: - aws needs: - 'webdevops/php-apache:8.2-alpine' -'webdevops/php:8.0-alpine': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.0-alpine' - - 'docker build --no-cache -t webdevops/php:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0-alpine" >> Dockerfile_65969e81aa7783.30504506' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7783.30504506' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhNzc4My4zMDUwNDUwNiJ9 Dockerfile_65969e81aa7783.30504506' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0-alpine --config php/test.yaml' - - 'docker push webdevops/php:8.0-alpine' - - 'docker tag webdevops/php:8.0-alpine $CI_REGISTRY_IMAGE/php:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php:8.0-alpine' - - 'docker tag webdevops/php:8.0-alpine webdevops/php-official:8.0-alpine' - - 'docker push webdevops/php-official:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0-alpine" >> Dockerfile_65969e81aa7a03.16807747' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7a03.16807747' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdhMDMuMTY4MDc3NDcifQ== Dockerfile_65969e81aa7a03.16807747' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0-alpine --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0-alpine' - - 'docker tag webdevops/php-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-nginx:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-nginx:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0-alpine" >> Dockerfile_65969e81aa7be3.43250156' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7be3.43250156' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMC1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhN2JlMy40MzI1MDE1NiJ9 Dockerfile_65969e81aa7be3.43250156' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0-alpine --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0-alpine' - - 'docker tag webdevops/php-nginx:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-nginx-dev:8.0-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0-alpine" >> Dockerfile_65969e81aa7d86.66793645' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7d86.66793645' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdkODYuNjY3OTM2NDUifQ== Dockerfile_65969e81aa7d86.66793645' - - 'docker push webdevops/php-nginx-dev:8.0-alpine' - - 'docker tag webdevops/php-nginx-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.0-alpine' -'webdevops/php-apache:8.0-alpine': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-apache:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0-alpine" >> Dockerfile_65969e81aa7f81.41127162' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa7f81.41127162' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjAtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTdmODEuNDExMjcxNjIifQ== Dockerfile_65969e81aa7f81.41127162' - - 'docker push webdevops/php-apache:8.0-alpine' - - 'docker tag webdevops/php-apache:8.0-alpine $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php:8.0-alpine' -'webdevops/php-apache-dev:8.0-alpine': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.0-alpine' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.0-alpine .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0-alpine" >> Dockerfile_65969e81aa80f5.58702224' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa80f5.58702224' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMC1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4wLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE4MGY1LjU4NzAyMjI0In0= Dockerfile_65969e81aa80f5.58702224' - - 'docker push webdevops/php-apache-dev:8.0-alpine' - - 'docker tag webdevops/php-apache-dev:8.0-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0-alpine' - tags: - - aws - needs: - - 'webdevops/php-apache:8.0-alpine' 'webdevops/php:8.1-alpine': stage: level2 before_script: @@ -824,10 +669,10 @@ stages: - 'cd docker/php-official/8.1-alpine' - 'docker build --no-cache -t webdevops/php:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_65969e81aa8276.62506533' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8276.62506533' + - 'echo "FROM webdevops/php:8.1-alpine" >> Dockerfile_667f1a78ea5481.67757977' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5481.67757977' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhODI3Ni42MjUwNjUzMyJ9 Dockerfile_65969e81aa8276.62506533' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNTQ4MS42Nzc1Nzk3NyJ9 Dockerfile_667f1a78ea5481.67757977' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1-alpine --config php/test.yaml' - 'docker push webdevops/php:8.1-alpine' @@ -849,10 +694,10 @@ stages: - 'cd docker/php-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_65969e81aa8427.09198127' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8427.09198127' + - 'echo "FROM webdevops/php-dev:8.1-alpine" >> Dockerfile_667f1a78ea57d7.69758972' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea57d7.69758972' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg0MjcuMDkxOTgxMjcifQ== Dockerfile_65969e81aa8427.09198127' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTU3ZDcuNjk3NTg5NzIifQ== Dockerfile_667f1a78ea57d7.69758972' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1-alpine' @@ -872,10 +717,10 @@ stages: - 'cd docker/php-nginx/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_65969e81aa8605.38624016' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8605.38624016' + - 'echo "FROM webdevops/php-nginx:8.1-alpine" >> Dockerfile_667f1a78ea5ad9.12373386' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5ad9.12373386' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhODYwNS4zODYyNDAxNiJ9 Dockerfile_65969e81aa8605.38624016' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMS1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhNWFkOS4xMjM3MzM4NiJ9 Dockerfile_667f1a78ea5ad9.12373386' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1-alpine' @@ -895,10 +740,10 @@ stages: - 'cd docker/php-nginx-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_65969e81aa87a7.17178267' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa87a7.17178267' + - 'echo "FROM webdevops/php-nginx-dev:8.1-alpine" >> Dockerfile_667f1a78ea5df7.88542972' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea5df7.88542972' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg3YTcuMTcxNzgyNjcifQ== Dockerfile_65969e81aa87a7.17178267' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTVkZjcuODg1NDI5NzIifQ== Dockerfile_667f1a78ea5df7.88542972' - 'docker push webdevops/php-nginx-dev:8.1-alpine' - 'docker tag webdevops/php-nginx-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1-alpine' @@ -916,10 +761,10 @@ stages: - 'cd docker/php-apache/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_65969e81aa8921.55210754' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8921.55210754' + - 'echo "FROM webdevops/php-apache:8.1-alpine" >> Dockerfile_667f1a78ea60d4.57421920' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea60d4.57421920' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYTg5MjEuNTUyMTA3NTQifQ== Dockerfile_65969e81aa8921.55210754' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjEtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTYwZDQuNTc0MjE5MjAifQ== Dockerfile_667f1a78ea60d4.57421920' - 'docker push webdevops/php-apache:8.1-alpine' - 'docker tag webdevops/php-apache:8.1-alpine $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1-alpine' @@ -937,10 +782,10 @@ stages: - 'cd docker/php-apache-dev/8.1-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_65969e81aa8ac9.88472855' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aa8ac9.88472855' + - 'echo "FROM webdevops/php-apache-dev:8.1-alpine" >> Dockerfile_667f1a78ea6379.68528757' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea6379.68528757' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWE4YWM5Ljg4NDcyODU1In0= Dockerfile_65969e81aa8ac9.88472855' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMS1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4xLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE2Mzc5LjY4NTI4NzU3In0= Dockerfile_667f1a78ea6379.68528757' - 'docker push webdevops/php-apache-dev:8.1-alpine' - 'docker tag webdevops/php-apache-dev:8.1-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1-alpine' @@ -958,10 +803,10 @@ stages: - 'cd docker/php-official/8.3-alpine' - 'docker build --no-cache -t webdevops/php:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_65969e81aaa4e7.42601644' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaa4e7.42601644' + - 'echo "FROM webdevops/php:8.3-alpine" >> Dockerfile_667f1a78ea8b41.81742789' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8b41.81742789' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYTRlNy40MjYwMTY0NCJ9 Dockerfile_65969e81aaa4e7.42601644' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOGI0MS44MTc0Mjc4OSJ9 Dockerfile_667f1a78ea8b41.81742789' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.3-alpine --config php/test.yaml' - 'docker push webdevops/php:8.3-alpine' @@ -983,10 +828,10 @@ stages: - 'cd docker/php-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_65969e81aaa7f8.89428890' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaa7f8.89428890' + - 'echo "FROM webdevops/php-dev:8.3-alpine" >> Dockerfile_667f1a78ea8e30.16387680' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea8e30.16387680' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWE3ZjguODk0Mjg4OTAifQ== Dockerfile_65969e81aaa7f8.89428890' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYThlMzAuMTYzODc2ODAifQ== Dockerfile_667f1a78ea8e30.16387680' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.3-alpine --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.3-alpine' @@ -1006,10 +851,10 @@ stages: - 'cd docker/php-nginx/8.3-alpine' - 'docker build --no-cache -t webdevops/php-nginx:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_65969e81aaab30.24147828' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaab30.24147828' + - 'echo "FROM webdevops/php-nginx:8.3-alpine" >> Dockerfile_667f1a78ea90c7.39536377' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea90c7.39536377' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYWIzMC4yNDE0NzgyOCJ9 Dockerfile_65969e81aaab30.24147828' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjMtYWxwaW5lIiwiRE9DS0VSX1RBRyI6IjguMy1hbHBpbmUiLCJPU19GQU1JTFkiOiJhbHBpbmUiLCJPU19WRVJTSU9OIjoiMyIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOTBjNy4zOTUzNjM3NyJ9 Dockerfile_667f1a78ea90c7.39536377' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.3-alpine --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.3-alpine' @@ -1019,6 +864,27 @@ stages: - aws needs: - 'webdevops/php:8.3-alpine' +'webdevops/php-nginx-dev:8.3-alpine': + stage: level4 + before_script: + - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' + - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' + image: webdevops/dockerfile-build-env + script: + - 'cd docker/php-nginx-dev/8.3-alpine' + - 'docker build --no-cache -t webdevops/php-nginx-dev:8.3-alpine .' + - 'cd $CI_PROJECT_DIR/tests/serverspec' + - 'echo "FROM webdevops/php-nginx-dev:8.3-alpine" >> Dockerfile_667f1a78ea9382.50928096' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9382.50928096' + - 'bundle install' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTkzODIuNTA5MjgwOTYifQ== Dockerfile_667f1a78ea9382.50928096' + - 'docker push webdevops/php-nginx-dev:8.3-alpine' + - 'docker tag webdevops/php-nginx-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.3-alpine' + tags: + - aws + needs: + - 'webdevops/php-nginx:8.3-alpine' 'webdevops/php-apache:8.3-alpine': stage: level3 before_script: @@ -1029,10 +895,10 @@ stages: - 'cd docker/php-apache/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_65969e81aaaf12.92675578' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aaaf12.92675578' + - 'echo "FROM webdevops/php-apache:8.3-alpine" >> Dockerfile_667f1a78ea9618.83273110' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9618.83273110' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWFmMTIuOTI2NzU1NzgifQ== Dockerfile_65969e81aaaf12.92675578' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4zLWFscGluZSIsIkRPQ0tFUl9UQUciOiI4LjMtYWxwaW5lIiwiT1NfRkFNSUxZIjoiYWxwaW5lIiwiT1NfVkVSU0lPTiI6IjMiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYTk2MTguODMyNzMxMTAifQ== Dockerfile_667f1a78ea9618.83273110' - 'docker push webdevops/php-apache:8.3-alpine' - 'docker tag webdevops/php-apache:8.3-alpine $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.3-alpine' @@ -1050,10 +916,10 @@ stages: - 'cd docker/php-apache-dev/8.3-alpine' - 'docker build --no-cache -t webdevops/php-apache-dev:8.3-alpine .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_65969e81aab221.09271346' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab221.09271346' + - 'echo "FROM webdevops/php-apache-dev:8.3-alpine" >> Dockerfile_667f1a78ea98a5.83179491' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea98a5.83179491' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiMjIxLjA5MjcxMzQ2In0= Dockerfile_65969e81aab221.09271346' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.3-alpine eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMy1hbHBpbmUiLCJET0NLRVJfVEFHIjoiOC4zLWFscGluZSIsIk9TX0ZBTUlMWSI6ImFscGluZSIsIk9TX1ZFUlNJT04iOiIzIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5OGE1LjgzMTc5NDkxIn0= Dockerfile_667f1a78ea98a5.83179491' - 'docker push webdevops/php-apache-dev:8.3-alpine' - 'docker tag webdevops/php-apache-dev:8.3-alpine $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.3-alpine' @@ -1071,10 +937,10 @@ stages: - 'cd docker/php-official/8.1' - 'docker build --no-cache -t webdevops/php:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.1" >> Dockerfile_65969e81aab589.41021901' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab589.41021901' + - 'echo "FROM webdevops/php:8.1" >> Dockerfile_667f1a78ea9b24.63300881' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9b24.63300881' - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiNTg5LjQxMDIxOTAxIn0= Dockerfile_65969e81aab589.41021901' + - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWE5YjI0LjYzMzAwODgxIn0= Dockerfile_667f1a78ea9b24.63300881' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php:8.1 --config php/test.yaml' - 'docker push webdevops/php:8.1' @@ -1096,10 +962,10 @@ stages: - 'cd docker/php-dev/8.1' - 'docker build --no-cache -t webdevops/php-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_65969e81aab8d8.02649728' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aab8d8.02649728' + - 'echo "FROM webdevops/php-dev:8.1" >> Dockerfile_667f1a78ea9e21.36207680' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78ea9e21.36207680' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYjhkOC4wMjY0OTcyOCJ9 Dockerfile_65969e81aab8d8.02649728' + - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhOWUyMS4zNjIwNzY4MCJ9 Dockerfile_667f1a78ea9e21.36207680' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.1 --config php-dev/test.yaml' - 'docker push webdevops/php-dev:8.1' @@ -1119,10 +985,10 @@ stages: - 'cd docker/php-nginx/8.1' - 'docker build --no-cache -t webdevops/php-nginx:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_65969e81aabc30.36776190' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aabc30.36776190' + - 'echo "FROM webdevops/php-nginx:8.1" >> Dockerfile_667f1a78eaa153.04305152' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa153.04305152' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFiYzMwLjM2Nzc2MTkwIn0= Dockerfile_65969e81aabc30.36776190' + - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjEiLCJET0NLRVJfVEFHIjoiOC4xIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEyIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY2N2YxYTc4ZWFhMTUzLjA0MzA1MTUyIn0= Dockerfile_667f1a78eaa153.04305152' - 'cd $CI_PROJECT_DIR/tests/structure-test' - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.1 --config php-nginx/test.yaml' - 'docker push webdevops/php-nginx:8.1' @@ -1142,10 +1008,10 @@ stages: - 'cd docker/php-nginx-dev/8.1' - 'docker build --no-cache -t webdevops/php-nginx-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_65969e81aabea0.64919119' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aabea0.64919119' + - 'echo "FROM webdevops/php-nginx-dev:8.1" >> Dockerfile_667f1a78eaa4e0.42729575' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa4e0.42729575' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYmVhMC42NDkxOTExOSJ9 Dockerfile_65969e81aabea0.64919119' + - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTRlMC40MjcyOTU3NSJ9 Dockerfile_667f1a78eaa4e0.42729575' - 'docker push webdevops/php-nginx-dev:8.1' - 'docker tag webdevops/php-nginx-dev:8.1 $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.1' @@ -1163,10 +1029,10 @@ stages: - 'cd docker/php-apache/8.1' - 'docker build --no-cache -t webdevops/php-apache:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_65969e81aac041.54500485' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac041.54500485' + - 'echo "FROM webdevops/php-apache:8.1" >> Dockerfile_667f1a78eaa807.54530156' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaa807.54530156' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYzA0MS41NDUwMDQ4NSJ9 Dockerfile_65969e81aac041.54500485' + - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4xIiwiRE9DS0VSX1RBRyI6IjguMSIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMiIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NjdmMWE3OGVhYTgwNy41NDUzMDE1NiJ9 Dockerfile_667f1a78eaa807.54530156' - 'docker push webdevops/php-apache:8.1' - 'docker tag webdevops/php-apache:8.1 $CI_REGISTRY_IMAGE/php-apache:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.1' @@ -1184,10 +1050,10 @@ stages: - 'cd docker/php-apache-dev/8.1' - 'docker build --no-cache -t webdevops/php-apache-dev:8.1 .' - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_65969e81aac277.34648619' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac277.34648619' + - 'echo "FROM webdevops/php-apache-dev:8.1" >> Dockerfile_667f1a78eaac02.87762131' + - 'echo "COPY conf/ /" >> Dockerfile_667f1a78eaac02.87762131' - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWMyNzcuMzQ2NDg2MTkifQ== Dockerfile_65969e81aac277.34648619' + - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.1 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMSIsIkRPQ0tFUl9UQUciOiI4LjEiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTIiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjY3ZjFhNzhlYWFjMDIuODc3NjIxMzEifQ== Dockerfile_667f1a78eaac02.87762131' - 'docker push webdevops/php-apache-dev:8.1' - 'docker tag webdevops/php-apache-dev:8.1 $CI_REGISTRY_IMAGE/php-apache-dev:8.1' - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.1' @@ -1195,137 +1061,3 @@ stages: - aws needs: - 'webdevops/php-apache:8.1' -'webdevops/php:8.0': - stage: level2 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-official/8.0' - - 'docker build --no-cache -t webdevops/php:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php:8.0" >> Dockerfile_65969e81aac4f1.09200919' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac4f1.09200919' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php_spec.rb webdevops/php:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1vZmZpY2lhbDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFjNGYxLjA5MjAwOTE5In0= Dockerfile_65969e81aac4f1.09200919' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php:8.0 --config php/test.yaml' - - 'docker push webdevops/php:8.0' - - 'docker tag webdevops/php:8.0 $CI_REGISTRY_IMAGE/php:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php:8.0' - - 'docker tag webdevops/php:8.0 webdevops/php-official:8.0' - - 'docker push webdevops/php-official:8.0' - tags: - - aws - needs: - - 'webdevops/toolbox:latest' -'webdevops/php-dev:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-dev/8.0' - - 'docker build --no-cache -t webdevops/php-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-dev:8.0" >> Dockerfile_65969e81aac786.86881703' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac786.86881703' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-dev_spec.rb webdevops/php-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhYzc4Ni44Njg4MTcwMyJ9 Dockerfile_65969e81aac786.86881703' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-dev:8.0 --config php-dev/test.yaml' - - 'docker push webdevops/php-dev:8.0' - - 'docker tag webdevops/php-dev:8.0 $CI_REGISTRY_IMAGE/php-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-dev:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-nginx:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx/8.0' - - 'docker build --no-cache -t webdevops/php-nginx:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx:8.0" >> Dockerfile_65969e81aac9c1.86208219' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aac9c1.86208219' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx_spec.rb webdevops/php-nginx:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueDo4LjAiLCJET0NLRVJfVEFHIjoiOC4wIiwiT1NfRkFNSUxZIjoiZGViaWFuIiwiT1NfVkVSU0lPTiI6IjEwIiwiUEhQX09GRklDSUFMIjoiMSIsIkRPQ0tFUkZJTEUiOiJEb2NrZXJmaWxlXzY1OTY5ZTgxYWFjOWMxLjg2MjA4MjE5In0= Dockerfile_65969e81aac9c1.86208219' - - 'cd $CI_PROJECT_DIR/tests/structure-test' - - '/usr/local/bin/container-structure-test test --image webdevops/php-nginx:8.0 --config php-nginx/test.yaml' - - 'docker push webdevops/php-nginx:8.0' - - 'docker tag webdevops/php-nginx:8.0 $CI_REGISTRY_IMAGE/php-nginx:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-nginx-dev:8.0': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-nginx-dev/8.0' - - 'docker build --no-cache -t webdevops/php-nginx-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-nginx-dev:8.0" >> Dockerfile_65969e81aacd19.15906247' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aacd19.15906247' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-nginx-dev_spec.rb webdevops/php-nginx-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1uZ2lueC1kZXY6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhY2QxOS4xNTkwNjI0NyJ9 Dockerfile_65969e81aacd19.15906247' - - 'docker push webdevops/php-nginx-dev:8.0' - - 'docker tag webdevops/php-nginx-dev:8.0 $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-nginx-dev:8.0' - tags: - - aws - needs: - - 'webdevops/php-nginx:8.0' -'webdevops/php-apache:8.0': - stage: level3 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache/8.0' - - 'docker build --no-cache -t webdevops/php-apache:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache:8.0" >> Dockerfile_65969e81aacf95.68202676' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aacf95.68202676' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache_spec.rb webdevops/php-apache:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGU6OC4wIiwiRE9DS0VSX1RBRyI6IjguMCIsIk9TX0ZBTUlMWSI6ImRlYmlhbiIsIk9TX1ZFUlNJT04iOiIxMCIsIlBIUF9PRkZJQ0lBTCI6IjEiLCJET0NLRVJGSUxFIjoiRG9ja2VyZmlsZV82NTk2OWU4MWFhY2Y5NS42ODIwMjY3NiJ9 Dockerfile_65969e81aacf95.68202676' - - 'docker push webdevops/php-apache:8.0' - - 'docker tag webdevops/php-apache:8.0 $CI_REGISTRY_IMAGE/php-apache:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache:8.0' - tags: - - aws - needs: - - 'webdevops/php:8.0' -'webdevops/php-apache-dev:8.0': - stage: level4 - before_script: - - 'docker login -u $DOCKER_USER -p $DOCKER_PASS' - - 'docker login -u $CI_REGISTRY_USER -p $CI_JOB_TOKEN $CI_REGISTRY' - image: webdevops/dockerfile-build-env - script: - - 'cd docker/php-apache-dev/8.0' - - 'docker build --no-cache -t webdevops/php-apache-dev:8.0 .' - - 'cd $CI_PROJECT_DIR/tests/serverspec' - - 'echo "FROM webdevops/php-apache-dev:8.0" >> Dockerfile_65969e81aad196.17719885' - - 'echo "COPY conf/ /" >> Dockerfile_65969e81aad196.17719885' - - 'bundle install' - - 'bash serverspec.sh spec/docker/php-apache-dev_spec.rb webdevops/php-apache-dev:8.0 eyJET0NLRVJfSU1BR0UiOiJ3ZWJkZXZvcHNcL3BocC1hcGFjaGUtZGV2OjguMCIsIkRPQ0tFUl9UQUciOiI4LjAiLCJPU19GQU1JTFkiOiJkZWJpYW4iLCJPU19WRVJTSU9OIjoiMTAiLCJQSFBfT0ZGSUNJQUwiOiIxIiwiRE9DS0VSRklMRSI6IkRvY2tlcmZpbGVfNjU5NjllODFhYWQxOTYuMTc3MTk4ODUifQ== Dockerfile_65969e81aad196.17719885' - - 'docker push webdevops/php-apache-dev:8.0' - - 'docker tag webdevops/php-apache-dev:8.0 $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - - 'docker push $CI_REGISTRY_IMAGE/php-apache-dev:8.0' - tags: - - aws - needs: - - 'webdevops/php-apache:8.0' diff --git a/ci/BLACKLIST b/ci/BLACKLIST index 31c82c306..fa626e512 100644 --- a/ci/BLACKLIST +++ b/ci/BLACKLIST @@ -4,4 +4,5 @@ 7.2 7.3 7.4 +8.0 ssh diff --git a/ci/composer.lock b/ci/composer.lock index 0b69e470e..576a5aeef 100644 --- a/ci/composer.lock +++ b/ci/composer.lock @@ -110,24 +110,24 @@ }, { "name": "symfony/console", - "version": "v6.2.1", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f" + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", - "reference": "58f6cef5dc5f641b7bbdbf8b32b44cc926c35f3f", + "url": "https://api.github.com/repos/symfony/console/zipball/6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", + "reference": "6edb5363ec0c78ad4d48c5128ebf4d083d89d3a9", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/deprecation-contracts": "^2.1|^3", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-mbstring": "~1.0", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/string": "^5.4|^6.0" + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" }, "conflict": { "symfony/dependency-injection": "<5.4", @@ -141,18 +141,16 @@ }, "require-dev": { "psr/log": "^1|^2|^3", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/lock": "^5.4|^6.0", - "symfony/process": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", "autoload": { @@ -181,12 +179,12 @@ "homepage": "https://symfony.com", "keywords": [ "cli", - "command line", + "command-line", "console", "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.2.1" + "source": "https://github.com/symfony/console/tree/v6.4.9" }, "funding": [ { @@ -202,20 +200,20 @@ "type": "tidelift" } ], - "time": "2022-12-01T13:44:20+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -224,7 +222,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -253,7 +251,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -269,20 +267,20 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -296,9 +294,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -335,7 +330,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -351,20 +346,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354" + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354", - "reference": "511a08c03c1960e08a883f4cffcacd219b758354", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", + "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", "shasum": "" }, "require": { @@ -375,9 +370,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -416,7 +408,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" }, "funding": [ { @@ -432,20 +424,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", "shasum": "" }, "require": { @@ -456,9 +448,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -500,7 +489,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" }, "funding": [ { @@ -516,20 +505,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -543,9 +532,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.27-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -583,7 +569,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -599,20 +585,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/process", - "version": "v6.2.0", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877" + "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/ba6e55359f8f755fe996c58a81e00eaa67a35877", - "reference": "ba6e55359f8f755fe996c58a81e00eaa67a35877", + "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", "shasum": "" }, "require": { @@ -644,7 +630,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.2.0" + "source": "https://github.com/symfony/process/tree/v6.4.8" }, "funding": [ { @@ -660,36 +646,34 @@ "type": "tidelift" } ], - "time": "2022-11-02T09:08:04+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.1.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/925e713fe8fcacf6bc05e936edd8dd5441a21239", - "reference": "925e713fe8fcacf6bc05e936edd8dd5441a21239", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" }, - "suggest": { - "symfony/service-implementation": "" - }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.1-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -729,7 +713,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.1.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -745,38 +729,39 @@ "type": "tidelift" } ], - "time": "2022-05-30T19:18:58+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v6.2.0", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "145702685e0d12f81d755c71127bfff7582fdd36" + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/145702685e0d12f81d755c71127bfff7582fdd36", - "reference": "145702685e0d12f81d755c71127bfff7582fdd36", + "url": "https://api.github.com/repos/symfony/string/zipball/14221089ac66cf82e3cf3d1c1da65de305587ff8", + "reference": "14221089ac66cf82e3cf3d1c1da65de305587ff8", "shasum": "" }, "require": { - "php": ">=8.1", + "php": ">=8.2", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/translation-contracts": "<2.0" + "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/error-handler": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/intl": "^6.2", - "symfony/translation-contracts": "^2.0|^3.0", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/emoji": "^7.1", + "symfony/error-handler": "^6.4|^7.0", + "symfony/http-client": "^6.4|^7.0", + "symfony/intl": "^6.4|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.4|^7.0" }, "type": "library", "autoload": { @@ -815,7 +800,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.2.0" + "source": "https://github.com/symfony/string/tree/v7.1.2" }, "funding": [ { @@ -831,34 +816,32 @@ "type": "tidelift" } ], - "time": "2022-11-30T17:13:47+00:00" + "time": "2024-06-28T09:27:18+00:00" }, { "name": "symfony/yaml", - "version": "v6.2.0", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "f2570f21bd4adc3589aa3133323273995109bae0" + "reference": "52903de178d542850f6f341ba92995d3d63e60c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/f2570f21bd4adc3589aa3133323273995109bae0", - "reference": "f2570f21bd4adc3589aa3133323273995109bae0", + "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9", + "reference": "52903de178d542850f6f341ba92995d3d63e60c9", "shasum": "" }, "require": { "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8" }, "conflict": { "symfony/console": "<5.4" }, "require-dev": { - "symfony/console": "^5.4|^6.0" - }, - "suggest": { - "symfony/console": "For validating YAML files using the lint command" + "symfony/console": "^5.4|^6.0|^7.0" }, "bin": [ "Resources/bin/yaml-lint" @@ -889,7 +872,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.2.0" + "source": "https://github.com/symfony/yaml/tree/v6.4.8" }, "funding": [ { @@ -905,7 +888,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T19:00:27+00:00" + "time": "2024-05-31T14:49:08+00:00" } ], "packages-dev": [], @@ -916,5 +899,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } diff --git a/conf/console.yml b/conf/console.yml index 807372d95..a5f536a12 100644 --- a/conf/console.yml +++ b/conf/console.yml @@ -43,11 +43,7 @@ dockerTest: OS_FAMILY: 'debian' OS_VERSION: '9' PHP_OFFICIAL: '1' - 'php[^:]*:8.(0|1|2)': - OS_FAMILY: 'debian' - OS_VERSION: '10' - PHP_OFFICIAL: '1' - 'php[^:]*:8.3': + 'php[^:]*:8.(0|1|2|3)': OS_FAMILY: 'debian' OS_VERSION: '12' - PHP_OFFICIAL: '1' \ No newline at end of file + PHP_OFFICIAL: '1' diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile b/docker/php-apache-dev/8.0-alpine/Dockerfile index 90be8e5c5..281dd770e 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 index 4c7c36014..a0050e801 100644 --- a/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.0-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile b/docker/php-apache-dev/8.1-alpine/Dockerfile index 8ca77ae5f..c9fcf72fe 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 index 7abed43e5..fff6f7d7c 100644 --- a/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.1-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile b/docker/php-apache-dev/8.2-alpine/Dockerfile index 681aebd27..70445ab4d 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 index 8277c3a77..c68e37beb 100644 --- a/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.2-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile b/docker/php-apache-dev/8.3-alpine/Dockerfile index 82a6f079b..b03474d47 100644 --- a/docker/php-apache-dev/8.3-alpine/Dockerfile +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 index 7924efa27..274c48746 100644 --- a/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache-dev/8.3-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-apache/8.0-alpine/Dockerfile b/docker/php-apache/8.0-alpine/Dockerfile index 66ac95743..02f34eae9 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile +++ b/docker/php-apache/8.0-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 index 9c90154e7..5c7635476 100644 --- a/docker/php-apache/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.0-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.1-alpine/Dockerfile b/docker/php-apache/8.1-alpine/Dockerfile index 9c6f00f7b..921f97317 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile +++ b/docker/php-apache/8.1-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 index 11c65544c..314711d47 100644 --- a/docker/php-apache/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.1-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.2-alpine/Dockerfile b/docker/php-apache/8.2-alpine/Dockerfile index 6c061c99a..018e992e4 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile +++ b/docker/php-apache/8.2-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 index c358fef80..9d86aecba 100644 --- a/docker/php-apache/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.2-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-apache/8.3-alpine/Dockerfile b/docker/php-apache/8.3-alpine/Dockerfile index d517235ce..9dc541057 100644 --- a/docker/php-apache/8.3-alpine/Dockerfile +++ b/docker/php-apache/8.3-alpine/Dockerfile @@ -28,7 +28,6 @@ RUN set -x \ s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \ s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \ ' /etc/apache2/httpd.conf \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 index 8c360939f..59e5ec3ff 100644 --- a/docker/php-apache/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-apache/8.3-alpine/Dockerfile.jinja2 @@ -7,7 +7,6 @@ RUN set -x \ {{ apache.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-dev/8.0-alpine/Dockerfile b/docker/php-dev/8.0-alpine/Dockerfile index cfe8225b3..efdabcf39 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile +++ b/docker/php-dev/8.0-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 index 99986a428..b46bc25ec 100644 --- a/docker/php-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.0-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.1-alpine/Dockerfile b/docker/php-dev/8.1-alpine/Dockerfile index cd437432c..8befbec67 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile +++ b/docker/php-dev/8.1-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 index 1357fad41..172b7e225 100644 --- a/docker/php-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.1-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.2-alpine/Dockerfile b/docker/php-dev/8.2-alpine/Dockerfile index 4d403da03..4ddf0a3d0 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile +++ b/docker/php-dev/8.2-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 index 1e8ba3c32..8b308d5d2 100644 --- a/docker/php-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.2-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-dev/8.3-alpine/Dockerfile b/docker/php-dev/8.3-alpine/Dockerfile index fedef5964..73d20a09f 100644 --- a/docker/php-dev/8.3-alpine/Dockerfile +++ b/docker/php-dev/8.3-alpine/Dockerfile @@ -27,5 +27,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 index da1b39185..599e24028 100644 --- a/docker/php-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-dev/8.3-alpine/Dockerfile.jinja2 @@ -4,5 +4,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.3") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile b/docker/php-nginx-dev/8.0-alpine/Dockerfile index fc7544cc6..baa6de93a 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 index 15a0bcd4c..42ca8087f 100644 --- a/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.0-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.0") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile b/docker/php-nginx-dev/8.1-alpine/Dockerfile index 0c04ace98..e2f717632 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 index d3bd5d756..ca0551600 100644 --- a/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.1-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.1") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile b/docker/php-nginx-dev/8.2-alpine/Dockerfile index a52a227a7..e2b649587 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 index e2a5982ff..51785650c 100644 --- a/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.2-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile b/docker/php-nginx-dev/8.3-alpine/Dockerfile index 4a53467f1..f5a822f7f 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile @@ -35,5 +35,4 @@ RUN set -x \ && docker-service enable syslog \ && docker-service enable postfix \ && docker-service enable ssh \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap diff --git a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 index 6c039d628..4ae7147e4 100644 --- a/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx-dev/8.3-alpine/Dockerfile.jinja2 @@ -8,5 +8,4 @@ RUN set -x \ {{ php.officialDevelopmentAlpine(version="8.2") }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} diff --git a/docker/php-nginx/8.0-alpine/Dockerfile b/docker/php-nginx/8.0-alpine/Dockerfile index ea2937ac3..251eed71f 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile +++ b/docker/php-nginx/8.0-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 index 6d867c42b..1115c6dd3 100644 --- a/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.0-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.1-alpine/Dockerfile b/docker/php-nginx/8.1-alpine/Dockerfile index 39e589994..bf47a72e4 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile +++ b/docker/php-nginx/8.1-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 index 35b37682f..6d53a2548 100644 --- a/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.1-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.2-alpine/Dockerfile b/docker/php-nginx/8.2-alpine/Dockerfile index 1295f85a3..606656154 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile +++ b/docker/php-nginx/8.2-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 index 63235633a..e6291274f 100644 --- a/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.2-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-nginx/8.3-alpine/Dockerfile b/docker/php-nginx/8.3-alpine/Dockerfile index 866d63117..d07da4e2b 100644 --- a/docker/php-nginx/8.3-alpine/Dockerfile +++ b/docker/php-nginx/8.3-alpine/Dockerfile @@ -19,7 +19,6 @@ RUN set -x \ # Install nginx && apk-install \ nginx \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap EXPOSE 80 443 diff --git a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 index c6558fc42..1fa397bae 100644 --- a/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-nginx/8.3-alpine/Dockerfile.jinja2 @@ -8,7 +8,6 @@ RUN set -x \ {{ nginx.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.expose('80 443') }} diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile index 33432606b..6c2db0712 100644 --- a/docker/php-official/8.0/Dockerfile +++ b/docker/php-official/8.0/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.0-fpm-buster +FROM php:8.0-fpm-bookworm LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,9 +96,8 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ + librabbitmq4 \ + libldap-2.5-0 \ libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/docker/php-official/8.0/Dockerfile.jinja2 b/docker/php-official/8.0/Dockerfile.jinja2 index 70656d01e..f4803b855 100644 --- a/docker/php-official/8.0/Dockerfile.jinja2 +++ b/docker/php-official/8.0/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.0-fpm-buster") }} +{{ docker.fromOfficial("php", "8.0-fpm-bookworm") }} {{ docker.version() }} @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('buster') }} + {{ bootstrap.debian('bookworm') }} RUN set -x \ {{ base.debian() }} \ @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.0') }} \ + {{ php.official(version='8.0',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.1-alpine/Dockerfile b/docker/php-official/8.1-alpine/Dockerfile index af79b0266..410833bb6 100644 --- a/docker/php-official/8.1-alpine/Dockerfile +++ b/docker/php-official/8.1-alpine/Dockerfile @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff @@ -63,8 +63,7 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ && apk-install shadow \ @@ -79,8 +78,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ # Install php environment @@ -239,8 +237,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap WORKDIR / EXPOSE 9000 diff --git a/docker/php-official/8.1-alpine/Dockerfile.jinja2 b/docker/php-official/8.1-alpine/Dockerfile.jinja2 index d173c0ed8..b8f6232f7 100644 --- a/docker/php-official/8.1-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.1-alpine/Dockerfile.jinja2 @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.18') }} + {{ bootstrap.alpine('3.20') }} RUN set -x \ {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ php.officialAlpine(version='8.1') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }} diff --git a/docker/php-official/8.1/Dockerfile b/docker/php-official/8.1/Dockerfile index c284f8fb5..165f76b6c 100644 --- a/docker/php-official/8.1/Dockerfile +++ b/docker/php-official/8.1/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.1-fpm-buster +FROM php:8.1-fpm-bookworm LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,9 +96,8 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ + librabbitmq4 \ + libldap-2.5-0 \ libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/docker/php-official/8.1/Dockerfile.jinja2 b/docker/php-official/8.1/Dockerfile.jinja2 index d116bbc4a..b04f11f2a 100644 --- a/docker/php-official/8.1/Dockerfile.jinja2 +++ b/docker/php-official/8.1/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.1-fpm-buster") }} +{{ docker.fromOfficial("php", "8.1-fpm-bookworm") }} {{ docker.version() }} @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('buster') }} + {{ bootstrap.debian('bookworm') }} RUN set -x \ {{ base.debian() }} \ @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.1') }} \ + {{ php.official(version='8.1',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.2-alpine/Dockerfile b/docker/php-official/8.2-alpine/Dockerfile index 9561fb855..16155a78b 100644 --- a/docker/php-official/8.2-alpine/Dockerfile +++ b/docker/php-official/8.2-alpine/Dockerfile @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff @@ -63,8 +63,7 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ && apk-install shadow \ @@ -79,8 +78,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ # Install php environment @@ -239,8 +237,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap WORKDIR / EXPOSE 9000 diff --git a/docker/php-official/8.2-alpine/Dockerfile.jinja2 b/docker/php-official/8.2-alpine/Dockerfile.jinja2 index 7d2ee3bfb..874bd9698 100644 --- a/docker/php-official/8.2-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.2-alpine/Dockerfile.jinja2 @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.18') }} + {{ bootstrap.alpine('3.20') }} RUN set -x \ {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ php.officialAlpine(version='8.2') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }} diff --git a/docker/php-official/8.2/Dockerfile b/docker/php-official/8.2/Dockerfile index 0b37fddae..ac4c78ac3 100644 --- a/docker/php-official/8.2/Dockerfile +++ b/docker/php-official/8.2/Dockerfile @@ -4,7 +4,7 @@ #+++++++++++++++++++++++++++++++++++++++ -FROM php:8.2-fpm-buster +FROM php:8.2-fpm-bookworm LABEL maintainer=info@webdevops.io \ vendor=WebDevOps.io \ @@ -38,7 +38,7 @@ RUN set -x \ && apt-update \ && /usr/local/bin/generate-dockerimage-info \ # Enable non-free - && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list \ + && sed -ri "s/(deb.*\/debian $(docker-image-info dist-codename) main)/\1 contrib non-free /" -- /etc/apt/sources.list.d/debian.sources \ && apt-update \ # System update && /usr/local/bin/apt-upgrade \ @@ -96,9 +96,8 @@ RUN set -x \ pngquant \ # Libraries libvips42 \ - librabbitmq4 \ - libldap-2.4-2 \ - zlibc \ + librabbitmq4 \ + libldap-2.5-0 \ libxslt1.1 \ libldap-common \ zlib1g \ diff --git a/docker/php-official/8.2/Dockerfile.jinja2 b/docker/php-official/8.2/Dockerfile.jinja2 index 4d2290454..2ffbae9f4 100644 --- a/docker/php-official/8.2/Dockerfile.jinja2 +++ b/docker/php-official/8.2/Dockerfile.jinja2 @@ -1,5 +1,5 @@ -{{ docker.fromOfficial("php", "8.2-fpm-buster") }} +{{ docker.fromOfficial("php", "8.2-fpm-bookworm") }} {{ docker.version() }} @@ -14,7 +14,7 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.debian('buster') }} + {{ bootstrap.debian('bookworm') }} RUN set -x \ {{ base.debian() }} \ @@ -27,7 +27,7 @@ RUN set -x \ {{ docker.cleanup() }} RUN set -x \ - {{ php.official(version='8.2') }} \ + {{ php.official(version='8.2',distribution='bookworm') }} \ {{ provision.runBootstrap() }} \ {{ docker.cleanup() }} diff --git a/docker/php-official/8.3-alpine/Dockerfile b/docker/php-official/8.3-alpine/Dockerfile index aa6029cdd..a8727bd9d 100644 --- a/docker/php-official/8.3-alpine/Dockerfile +++ b/docker/php-official/8.3-alpine/Dockerfile @@ -37,7 +37,7 @@ COPY conf/ /opt/docker/ RUN set -x \ # Init bootstrap # Add community - && echo https://dl-4.alpinelinux.org/alpine/v3.18/community/ >> /etc/apk/repositories \ + && echo https://dl-4.alpinelinux.org/alpine/v3.20/community/ >> /etc/apk/repositories \ # System update && /usr/local/bin/apk-upgrade \ # Install base stuff @@ -63,8 +63,7 @@ RUN set -x \ tzdata \ busybox-suid \ && chmod +s /sbin/gosu \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ && apk-install shadow \ @@ -79,8 +78,7 @@ RUN set -x \ rsync \ patch \ git \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap RUN set -x \ # Install php environment @@ -239,8 +237,7 @@ RUN set -x \ # Enable php services && docker-service enable syslog \ && docker-service enable cron \ - && docker-run-bootstrap \ - && docker-image-cleanup + && docker-run-bootstrap WORKDIR / EXPOSE 9000 diff --git a/docker/php-official/8.3-alpine/Dockerfile.jinja2 b/docker/php-official/8.3-alpine/Dockerfile.jinja2 index 9cb68558b..a11af6e8b 100644 --- a/docker/php-official/8.3-alpine/Dockerfile.jinja2 +++ b/docker/php-official/8.3-alpine/Dockerfile.jinja2 @@ -15,22 +15,19 @@ {{ docker.copy('conf/', '/opt/docker/') }} RUN set -x \ - {{ bootstrap.alpine('3.18') }} + {{ bootstrap.alpine('3.20') }} RUN set -x \ {{ base.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ baseapp.alpine() }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} RUN set -x \ {{ php.officialAlpine(version='8.3') }} \ - {{ provision.runBootstrap() }} \ - {{ docker.cleanup() }} + {{ provision.runBootstrap() }} {{ docker.workdir('/') }} {{ docker.expose('9000') }}