Merge pull request #2 from praxxus11/add-nginx

Add nginx

.github/workflows/build-deploy-docker.yml

@@ -12,10 +12,28 @@ env:
   GITLAB_REGISTRY_TOKEN: ${{ secrets.GITLAB_REGISTRY_TOKEN }}
 
 jobs:
+  detect-changes:
+    runs-on: ubuntu-20.04
+    permissions:
+      pull-requests: read
+    outputs:
+      gateway: ${{ steps.paths_filter.outputs.gateway }}
+      nginx: ${{ steps.paths_filter.outputs.nginx }}
+    steps: 
+      - name: Execute paths filter.
+        uses: dorny/paths-filter@v3
+        id: paths_filter
+        with:
+          filters: |
+            gateway:
+              - "./gateway/**"
+            nginx:
+              - "./nginx/**"
   build-gateway:
+    needs: detect-changes
+    if: ${{ needs.detect-changes.outputs.gateway == 'true' }}
     runs-on: ubuntu-20.04
     steps:
-      - run: ls -a
       - name: Check out repo.
         uses: actions/checkout@v4
       - name: Setup buildx
@@ -29,9 +47,28 @@ jobs:
             --tag registry.gitlab.com/segmentation964330/service/gateway \
             --push \
             ./gateway
+  build-nginx:
+    needs: detect-changes
+    if: ${{ needs.detect-changes.outputs.nginx == 'true' }}
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Check out repo.
+        uses: actions/checkout@v4
+      - name: Setup buildx
+        run:  docker buildx create --use
+      - name: Sign in to segmentation gitlab registry.
+        run: echo "$GITLAB_REGISTRY_TOKEN" | docker login registry.gitlab.com -u "$GITLAB_REGISTRY_USERNAME" --password-stdin
+      - name: Build nginx image.
+        run: |
+          docker buildx build \
+            --platform linux/arm64 \
+            --tag registry.gitlab.com/segmentation964330/service/nginx \
+            --push \
+            ./nginx
   deploy:
     runs-on: ubuntu-20.04
-    needs: [build-gateway]
+    needs: [build-gateway, build-nginx]
+    if: ${{ always() && !failure() && !cancelled() }}
     steps:
       - name: Check out repo.
         uses: actions/checkout@v4
@@ -54,4 +91,5 @@ jobs:
             echo "$GITLAB_REGISTRY_TOKEN" | docker login registry.gitlab.com -u "$GITLAB_REGISTRY_USERNAME" --password-stdin
             sudo docker compose down
             sudo docker compose pull
-            sudo docker compose up --detach
+            sudo docker compose up --detach
+            sudo docker image prune --force

docker-compose.yml

@@ -1,13 +1,23 @@
 services:
   gateway:
+    container_name: gateway
     image: registry.gitlab.com/segmentation964330/service/gateway
     build:
       context: ./gateway
-    ports:
-      - "80:8000"
     volumes:
       - ./artifacts/images:/home/artifacts/images
       - ./artifacts/logs:/home/artifacts/logs
       - ./artifacts/models:/home/artifacts/models
     tty: true
-    stdin_open: false
+    stdin_open: true
+  nginx:
+    container_name: nginx
+    image: registry.gitlab.com/segmentation964330/service/nginx
+    build:
+      context: ./nginx
+    ports:
+      - "80:80"
+    depends_on:
+      - gateway
+    tty: true
+    stdin_open: true

gateway/server/app.py

@@ -24,7 +24,7 @@ def gui():
 @app.route("/healthcheck")
 def hello_world():
     logger.info("Healthcheck.")
-    return "hello", 200
+    return "Hello world!", 200
 
 @app.route("/predict", methods=["POST"])
 def predict():

nginx/Dockerfile

@@ -0,0 +1,3 @@
+FROM nginx:1.27.0-alpine3.19
+RUN rm /etc/nginx/conf.d/default.conf
+COPY ./gateway.conf /etc/nginx/conf.d

nginx/gateway.conf

@@ -0,0 +1,17 @@
+upstream segmentation_gateways {
+    # Docker container with name gateway must be running
+    server gateway:8000;
+}
+
+server {
+    listen 80;
+
+    location / {
+        proxy_pass http://segmentation_gateways;
+
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}