saibotk-de/saiblog
1
0
Fork 0
Code Packages 1 Activity

fix docker directory name

Browse source
This commit is contained in:
Saibotk 2022-10-23 12:34:57 +02:00
parent 4f1903bcb8
commit d9bbf02527
Signed by: saibotk
GPG key ID: 67585F0065E261D5
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.docker/Dockerfile
View file

@ -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'

2
.dockerignore
View file

@ -1,3 +1,3 @@
*
!dist
!_docker
!.docker

4
.gitlab-ci.yml
View file

@ -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