Skip to content
Snippets Groups Projects
Commit 3fb95916 authored by Tomáš Valenta's avatar Tomáš Valenta
Browse files

Merge branch 'main' of gitlab.pirati.cz:to/rybicka

parents b9b808ee 647f0bc1
Branches
No related tags found
No related merge requests found
Pipeline #10947 passed
...@@ -20,3 +20,11 @@ build_app: ...@@ -20,3 +20,11 @@ build_app:
- docker pull $CI_REGISTRY_IMAGE:test || true - docker pull $CI_REGISTRY_IMAGE:test || true
- docker build --cache-from $CI_REGISTRY_IMAGE:test -t $IMAGE_TAG_APP . - docker build --cache-from $CI_REGISTRY_IMAGE:test -t $IMAGE_TAG_APP .
- docker push $IMAGE_TAG_APP - docker push $IMAGE_TAG_APP
build_nginx:
stage: build
when: manual
script:
- docker pull $CI_REGISTRY_IMAGE:test-nginx || true
- docker build --cache-from $CI_REGISTRY_IMAGE:test-nginx -t $IMAGE_TAG_NGINX . -f Dockerfile.nginx
- docker push $IMAGE_TAG_NGINX
upstream rybicka {
ip_hash;
server app:8000;
}
server {
server_name rybicka;
listen 8080;
client_max_body_size 10M;
proxy_connect_timeout 60;
proxy_send_timeout 60;
proxy_read_timeout 60;
send_timeout 60;
location / {
proxy_pass http://rybicka/;
proxy_set_header Host $host;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment