[extensions-web/wip/ocp4: 2/2] openshift: switch to default nginx image
- From: Yuri Konotopov <ykonotopov src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [extensions-web/wip/ocp4: 2/2] openshift: switch to default nginx image
- Date: Sat, 28 May 2022 18:27:26 +0000 (UTC)
commit 706c4aa64a51fdc6d8b6ed1110ce65492853f435
Author: Yuri Konotopov <ykonotopov gnome org>
Date: Sat May 28 22:26:22 2022 +0400
openshift: switch to default nginx image
.gitlab-ci.yml | 11 -----
openshift/docker/default.conf.template | 61 +++++++++++++++++++++++++
openshift/docker/docker-compose.yml | 13 +-----
openshift/docker/nginx/nginx.conf | 82 ----------------------------------
4 files changed, 63 insertions(+), 104 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7da630d..68dff8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,14 +92,3 @@ deploy:
- !reference [.build image, script]
- buildah login -u ${OCI_REGISTRY_USER} -p ${OCI_REGISTRY_PASSWORD} quay.io
- buildah push quay.io/gnome_infrastructure/extensions:latest
-
-deploy-frontend:
- stage: deploy
- image: quay.io/gnome_infrastructure/buildah:latest
- rules:
- - if: ($CI_COMMIT_REF_PROTECTED == "true")
- when: manual
- script:
- - buildah bud -t quay.io/gnome_infrastructure/extensions:frontend -f openshift/docker/nginx/Dockerfile
openshift/docker/nginx
- - buildah login -u ${OCI_REGISTRY_USER} -p ${OCI_REGISTRY_PASSWORD} quay.io
- - buildah push quay.io/gnome_infrastructure/extensions:frontend
diff --git a/openshift/docker/default.conf.template b/openshift/docker/default.conf.template
new file mode 100644
index 0000000..4cb1fe1
--- /dev/null
+++ b/openshift/docker/default.conf.template
@@ -0,0 +1,61 @@
+server {
+ listen 8080 default_server;
+
+ charset utf-8;
+
+ sendfile on;
+ tcp_nopush on;
+ tcp_nodelay on;
+ server_tokens off;
+ client_max_body_size 16m;
+
+ keepalive_timeout 65;
+
+ gzip on;
+ gzip_types text/css text/html text/plain application/javascript application/json application/xml;
+
+ root /usr/share/nginx/html;
+
+ set_real_ip_from 10.0.0.0/8;
+ set_real_ip_from 172.16.0.0/12;
+ set_real_ip_from 192.168.0.0/16;
+
+ real_ip_header X-Forwarded-For;
+
+ add_header X-Content-Type-Options nosniff;
+ add_header X-Frame-Options SAMEORIGIN;
+
+ location /healthz {
+ access_log off;
+ return 200;
+ }
+
+ location = /favicon.ico {
+ log_not_found off;
+ access_log off;
+ }
+
+ location = /robots.txt {
+ allow all;
+ log_not_found off;
+ access_log off;
+ }
+
+ location /extension-data/ {
+ alias /extensions-web/www/uploaded-files/;
+ }
+
+ location /static/ {
+ location ~* \.(jpg|jpeg|gif|png|svg|ico|css|pdf|txt|bmp|js)$ {
+ access_log off;
+ expires 3d;
+ }
+
+ alias /extensions-web/www/static-files/;
+ }
+
+ location / {
+ uwsgi_pass ${EGO_NODE_ADDRESS}:8001;
+ include uwsgi_params;
+ }
+}
diff --git a/openshift/docker/docker-compose.yml b/openshift/docker/docker-compose.yml
index f73ff09..118924f 100644
--- a/openshift/docker/docker-compose.yml
+++ b/openshift/docker/docker-compose.yml
@@ -68,23 +68,14 @@ services:
- db
frontend:
- build:
- context: nginx
- dockerfile: Dockerfile
- command:
- - bash
- - -c
- - >-
- envsubst '$$EGO_NODE_ADDRESS' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf &&
- /docker-entrypoint.sh nginx -g "daemon off;"
+ image: nginx:stable
environment:
EGO_NODE_ADDRESS: extensions-web
- links:
- - extensions-web
ports:
- "127.0.0.1:8080:8080"
volumes:
- "ego-static:/extensions-web/www"
+ - ./default.conf.template:/etc/nginx/templates/default.conf.template:ro
networks:
- frontend
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]