From d9bbf025278fbd7e487bdbc0444114125f9daddf Mon Sep 17 00:00:00 2001 From: Saibotk Date: Sun, 23 Oct 2022 12:34:57 +0200 Subject: [PATCH] fix docker directory name --- .docker/Dockerfile | 2 +- .dockerignore | 2 +- .gitlab-ci.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 4873506..72029d3 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -2,6 +2,6 @@ FROM docker.io/library/nginx:1.23.1-alpine COPY ./dist/ /usr/share/nginx/html/ -COPY ./_docker/default.conf /etc/nginx/conf.d/ +COPY ./.docker/default.conf /etc/nginx/conf.d/ HEALTHCHECK CMD wget -O- http://127.0.0.1/status.txt | grep -q 'OK' diff --git a/.dockerignore b/.dockerignore index cff300e..0503e00 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,3 @@ * !dist -!_docker +!.docker diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1e62f4c..d46d558 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ package: before_script: - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - podman build --pull -f _docker/Dockerfile -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . + - podman build --pull -f .docker/Dockerfile -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" . - podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" except: - deploy @@ -58,7 +58,7 @@ package-deploy: before_script: - podman login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY script: - - podman build --pull -f _docker/Dockerfile -t "$CI_REGISTRY_IMAGE" . + - podman build --pull -f .docker/Dockerfile -t "$CI_REGISTRY_IMAGE" . - podman push "$CI_REGISTRY_IMAGE" only: - deploy