[PR #2471/8a2774ae backport][stable-4.10] Include nginx snippets in the compose env (#2487)

Include nginx snippets in the compose env (#2471)

Include the nginx snippets in the compose env

Signed-off-by: Fabricio Aguiar <[email protected]>

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

(cherry picked from commit 8a2774a)

Co-authored-by: Fabricio Aguiar <[email protected]>

Author: patchback[bot]

dev/compose/Dockerfile.nginx

@@ -0,0 +1,16 @@
+# This Dockerfile is meant to extract the nginx snippets from Dockerfile.rhel8
+FROM localhost/galaxy_ng/galaxy_ng:base as builder
+
+USER root
+RUN mkdir -p /etc/nginx/pulp \
+    && ln $(pip show pulp_ansible | sed -n -e 's/Location: //p')/pulp_ansible/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_ansible.conf \
+    && ln $(pip show pulp_container | sed -n -e 's/Location: //p')/pulp_container/app/webserver_snippets/nginx.conf /etc/nginx/pulp/pulp_container.conf \
+    && cp /app/galaxy_ng/app/webserver_snippets/nginx.conf /etc/nginx/pulp/galaxy.conf
+
+FROM docker.io/nginx:latest
+
+RUN mkdir -p /etc/nginx/pulp
+COPY --from=builder /etc/nginx/pulp/*.conf /etc/nginx/pulp
+
+# Run script uses standard ways to run the application
+CMD nginx -g "daemon off;"

dev/compose/aap.yaml

@@ -101,6 +101,14 @@ services:
         <<: *common-env
     image: "localhost/galaxy_ng/galaxy_ng:dev"
 
+  base_img_nginx:  # Extracts nginx files from base_img
+    depends_on:
+      - base_img
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
+
   redis:
     image: "redis:5"
 
@@ -286,8 +294,9 @@ services:
       "
 
   nginx:
-    image: "nginx:latest"
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
     depends_on:
+      - base_img_nginx
       - postgres
       - migrations
       - api

dev/compose/certified-sync.yaml

@@ -122,6 +122,14 @@ services:
         <<: *common-env
     image: "localhost/galaxy_ng/galaxy_ng:dev"
 
+  base_img_nginx:  # Extracts nginx files from base_img
+    depends_on:
+      - base_img
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
+
   redis:
     image: "redis:5"
 
@@ -305,8 +313,9 @@ services:
       "
 
   standalone-nginx:
-    image: "nginx:latest"
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
     depends_on:
+      - base_img_nginx
       - standalone-postgres
       - standalone-migrations
       - standalone-api
@@ -524,8 +533,9 @@ services:
       "
 
   insights-nginx:
-    image: "nginx:latest"
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
     depends_on:
+      - base_img_nginx
       - insights-postgres
       - insights-migrations
       - insights-api

dev/compose/community.yaml

@@ -111,6 +111,14 @@ services:
         <<: *common-env
     image: "localhost/galaxy_ng/galaxy_ng:dev"
 
+  base_img_nginx:  # Extracts nginx files from base_img
+    depends_on:
+      - base_img
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
+
   github:
     build:
       context: '../../profiles/community/github_mock'
@@ -288,8 +296,9 @@ services:
       "
 
   nginx:
-    image: "nginx:latest"
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
     depends_on:
+      - base_img_nginx
       - postgres
       - migrations
       - api

dev/compose/insights.yaml

@@ -102,6 +102,14 @@ services:
         <<: *common-env
     image: "localhost/galaxy_ng/galaxy_ng:dev"
 
+  base_img_nginx:  # Extracts nginx files from base_img
+    depends_on:
+      - base_img
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
+
   proxy:
     build:
       context: "../../profiles/insights/proxy"
@@ -286,8 +294,9 @@ services:
       "
 
   nginx:
-    image: "nginx:latest"
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
     depends_on:
+      - base_img_nginx
       - postgres
       - migrations
       - api

dev/compose/standalone.yaml

@@ -107,6 +107,14 @@ services:
         <<: *common-env
     image: "localhost/galaxy_ng/galaxy_ng:dev"
 
+  base_img_nginx:  # Extracts nginx files from base_img
+    depends_on:
+      - base_img
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
+
   redis:
     image: "redis:5"
 
@@ -290,8 +298,9 @@ services:
       "
 
   nginx:
-    image: "nginx:latest"
+    image: "localhost/galaxy_ng/galaxy_ng:nginx"
     depends_on:
+      - base_img_nginx
       - postgres
       - migrations
       - api

dev/nginx/certified-sync/insights.conf

@@ -73,7 +73,7 @@ http {
             proxy_pass http://pulp-api;
         }
 
-        # include pulp/*.conf;
+        include pulp/*.conf;
 
         location / {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

dev/nginx/certified-sync/standalone.conf

@@ -73,7 +73,7 @@ http {
             proxy_pass http://pulp-api;
         }
 
-        # include pulp/*.conf;
+        include pulp/*.conf;
 
         location / {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

dev/nginx/nginx.conf

@@ -73,7 +73,7 @@ http {
             proxy_pass http://pulp-api;
         }
 
-        # include pulp/*.conf;
+        include pulp/*.conf;
 
         location / {
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;