From ffde141730557e15bdb680b0f6e1476148785ee6 Mon Sep 17 00:00:00 2001 From: kiy0taka Date: Fri, 27 May 2022 19:08:50 +0900 Subject: [PATCH] =?UTF-8?q?ec-cube=E3=82=B3=E3=83=B3=E3=83=86=E3=83=8A?= =?UTF-8?q?=E3=81=8C=E8=B5=B7=E5=8B=95=E3=81=99=E3=82=8B=E3=81=BE=E3=81=A7?= =?UTF-8?q?=E5=BE=85=E6=A9=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dockerbuild.yml | 6 ++---- Dockerfile | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerbuild.yml b/.github/workflows/dockerbuild.yml index 2fe7b5dc642..d9f7aa6505c 100644 --- a/.github/workflows/dockerbuild.yml +++ b/.github/workflows/dockerbuild.yml @@ -70,11 +70,9 @@ jobs: DATABASE_URL: ${{ matrix.database_url }} DATABASE_SERVER_VERSION: ${{ matrix.database_server_version }} run: | - docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml up -d - docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml exec -T ec-cube bin/console doctrine:schema:create --env=dev - docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml exec -T ec-cube bin/console eccube:fixtures:load --env=dev + docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml up -d --wait sed -i 's!APP_ENV: "dev"!APP_ENV: "prod"!g' docker-compose.yml - docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml up -d + docker-compose -f docker-compose.yml -f docker-compose.pgsql.yml up -d --wait - name: setup-chromedriver uses: nanasess/setup-chromedriver@master diff --git a/Dockerfile b/Dockerfile index f01206b91d2..ba237276473 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,3 +75,5 @@ RUN find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune && find ${APACHE_DOCUMENT_ROOT} \( -path ${APACHE_DOCUMENT_ROOT}/vendor -prune \) -or \( -type d -print0 \) \ | xargs -0 chmod g+s \ ; + +HEALTHCHECK --interval=10s --timeout=5s --retries=30 CMD pgrep apache \ No newline at end of file