diff --git a/1/fpm/Dockerfile b/1/fpm/Dockerfile index 04dbdae..3475bfa 100644 --- a/1/fpm/Dockerfile +++ b/1/fpm/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /var/www/html ENV BACKDROP_VERSION=1.29.2 ENV BACKDROP_MD5=dcb27feb72d78f1f14120d4c9a6bc70b -RUN curl -fSL "https://github.com/backdrop/backdrop/archive/${BACKDROP_VERSION}.tar.gz" -o backdrop.tar.gz \ +RUN curl -fSL "https://github.com/backdrop/backdrop/archive/refs/tags/${BACKDROP_VERSION}.tar.gz" -o backdrop.tar.gz \ && echo "${BACKDROP_MD5} *backdrop.tar.gz" | md5sum -c - \ && tar -xz --strip-components=1 -f backdrop.tar.gz \ && rm backdrop.tar.gz \ diff --git a/docker-compose.yml b/compose.apache.yml similarity index 62% rename from docker-compose.yml rename to compose.apache.yml index ebf65a1..63b8ad2 100644 --- a/docker-compose.yml +++ b/compose.apache.yml @@ -1,3 +1,4 @@ +name: docker-evaluation services: backdrop: build: @@ -8,6 +9,10 @@ services: BACKDROP_DB_HOST: db BACKDROP_DB_USER: backdrop BACKDROP_DB_PASSWORD: backdrop + depends_on: + db: + condition: service_healthy + restart: true db: image: mysql @@ -16,3 +21,7 @@ services: MYSQL_PASSWORD: backdrop MYSQL_ALLOW_EMPTY_PASSWORD: 'yes' MYSQL_DATABASE: backdrop + healthcheck: + test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"] + timeout: 6s + retries: 10 diff --git a/compose.yml b/compose.yml new file mode 120000 index 0000000..db884ee --- /dev/null +++ b/compose.yml @@ -0,0 +1 @@ +compose.apache.yml \ No newline at end of file