default nginx vhost config moved around

This commit is contained in:
Sebastian Hugentobler 2021-06-20 11:54:28 +02:00
parent f8a2f4420e
commit f566463fe2
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0
3 changed files with 5 additions and 4 deletions

View File

@ -5,9 +5,9 @@ build:
stage: build stage: build
script: script:
- docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
- docker build --pull -t $IMAGE_NAME:$CI_COMMIT_SHA . - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
- docker build --pull -t $IMAGE_NAME:$CI_COMMIT_REF_NAME . - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
- docker build --pull -t $IMAGE_NAME:latest . - docker build -t $IMAGE_NAME:latest .
- docker push $IMAGE_NAME:$CI_COMMIT_SHA - docker push $IMAGE_NAME:$CI_COMMIT_SHA
- docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
- docker push $IMAGE_NAME:latest - docker push $IMAGE_NAME:latest

View File

@ -140,6 +140,7 @@ RUN apk add --no-cache \
php8-ldap php8-ldap
RUN chown -R nginx:nginx /var/lib/nextcloud RUN chown -R nginx:nginx /var/lib/nextcloud
RUN rm /etc/nginx/http.d/default.conf
ADD /rootfs / ADD /rootfs /

View File

@ -1,3 +1,3 @@
[template] [template]
src = "nextcloud.conf.tmpl" src = "nextcloud.conf.tmpl"
dest = "/etc/nginx/conf.d/nextcloud.conf" dest = "/etc/nginx/http.d/nextcloud.conf"