Merge branch 'main' into dev

.github/workflows/ansible-lint.yml

@@ -0,0 +1,23 @@
+# .github/workflows/ansible-lint.yml
+name: ansible-lint
+on:
+  pull_request:
+    branches: ["main"]
+  push:
+    branches: ["main"]
+
+jobs:
+  build:
+    name: Ansible Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Ansible Lint
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y python3-pip
+          pip install ansible-lint
+
+      - name: Linting the ansible role
+        working-directory: url-shortener/playbook/roles/docker
+        run: ansible-lint -p . --exclude=tests/

url-shortener/frontend-servers/compose.yaml

@@ -36,4 +36,4 @@ services:
     ports:
       - "3000:3000"
     depends_on:
-      - proxy
+      - proxy

url-shortener/servers/compose.yaml

@@ -1,14 +1,14 @@
 services:
   go:
-    image: 4b33b091a935
+    image: 4b33b091a935 # replace with image/local-tagid
 #    build:
 #      context: go/
 #      dockerfile: Dockerfile
     ports:
       - "1234:1234"
 
   express:
-    image: feb890d9439b
+    image: feb890d9439b # replace with image/local-tagid
 #    build:
 #      context: express-js/
 #      dockerfile: Dockerfile

url-shortener/servers/proxy/urlShort.conf

@@ -1,7 +1,6 @@
 upstream backend {
-    least_conn;
     server go:1234;
-    server go:5678;
+    server express:5678;
 }
 
 server {