update deployment configs to use unprivledged nginx

12-deploying-containers/Makefile

@@ -0,0 +1,6 @@
+### Build + Push Images
+.PHONY: build-push
+build-push:
+	cd ../06-building-container-images/client-react && N=5 $(MAKE) build-N && N=5 $(MAKE) push-N
+	cd ../06-building-container-images/api-node && N=9 $(MAKE) build-N && N=9 $(MAKE) push-N
+	cd ../06-building-container-images/api-golang && N=8 $(MAKE) build-N && N=8 $(MAKE) push-N

12-deploying-containers/docker-swarm/Makefile

@@ -25,6 +25,10 @@ swarm-init:
 swarm-deploy-stack:
 	DOCKER_HOST=${DOCKER_HOST} docker stack deploy -c docker-swarm.yml example-app
 
+.PHONY: swarm-ls
+swarm-ls:
+	DOCKER_HOST=${DOCKER_HOST} docker service ls
+
 .PHONY: swarm-remove-stack
 swarm-remove-stack:
 	DOCKER_HOST=${DOCKER_HOST} docker stack rm example-app
@@ -32,4 +36,4 @@ swarm-remove-stack:
 .PHONY: create-secrets
 create-secrets:
 	echo -n "foobarbaz" | DOCKER_HOST=${DOCKER_HOST} docker secret create postgres-passwd -
-	echo -n "postgres://postgres:foobarbaz@db:5432/postgres" | DOCKER_HOST=${DOCKER_HOST} docker secret create database-url -
+	echo -n "postgres://postgres:foobarbaz@db:5432/postgres" | DOCKER_HOST=${DOCKER_HOST} docker secret create database-url -

12-deploying-containers/docker-swarm/docker-compose-prod.yml

@@ -6,16 +6,16 @@ services:
     networks:
       - frontend
     ports:
-      - 80:80
+      - 80:8080
     restart: unless-stopped
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/ping"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/ping"]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 10s
   api-node:
-    image: sidpalas/devops-directive-docker-course-api-node:8
+    image: sidpalas/devops-directive-docker-course-api-node:9
     read_only: true
     networks:
       - frontend
@@ -35,7 +35,7 @@ services:
       retries: 3
       start_period: 10s
   api-golang:
-    image: sidpalas/devops-directive-docker-course-api-golang:7
+    image: sidpalas/devops-directive-docker-course-api-golang:8
     read_only: true
     networks:
       - frontend

12-deploying-containers/docker-swarm/docker-swarm.yml

@@ -11,15 +11,15 @@ services:
     networks:
       - frontend
     ports:
-      - 80:80
+      - 80:8080
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost/ping"]
+      test: ["CMD", "curl", "-f", "http://localhost:8080/ping"]
       interval: 30s
       timeout: 5s
       retries: 3
       start_period: 10s
   api-node:
-    image: sidpalas/devops-directive-docker-course-api-node:8
+    image: sidpalas/devops-directive-docker-course-api-node:9
     read_only: true
     deploy:
       mode: replicated
@@ -42,7 +42,7 @@ services:
       retries: 3
       start_period: 10s
   api-golang:
-    image: sidpalas/devops-directive-docker-course-api-golang:7
+    image: sidpalas/devops-directive-docker-course-api-golang:8
     read_only: true
     deploy:
       mode: replicated

12-deploying-containers/kubernetes/api-golang.yml

@@ -28,7 +28,7 @@ spec:
     spec:
       containers:
         - name: api-golang
-          image: sidpalas/devops-directive-docker-course-api-golang:7
+          image: sidpalas/devops-directive-docker-course-api-golang:8
           env:
             - name: PORT
               value: "8080"

12-deploying-containers/kubernetes/api-node.yml

@@ -28,7 +28,7 @@ spec:
     spec:
       containers:
         - name: api-node
-          image: sidpalas/devops-directive-docker-course-api-node:8
+          image: sidpalas/devops-directive-docker-course-api-node:9
           env:
             - name: PORT
               value: "3000"

12-deploying-containers/kubernetes/client-react-nginx.yml

@@ -1,3 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: client-react-nginx
+spec:
+  selector:
+    app: client-react-nginx
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -17,14 +29,15 @@ spec:
       containers:
       - image: sidpalas/devops-directive-docker-course-client-react-nginx:5
         name: client-react-nginx
+        imagePullPolicy: Always
         ports:
-        - containerPort: 80
+        - containerPort: 8080
           protocol: TCP
         readinessProbe:
           failureThreshold: 3
           httpGet:
             path: /ping
-            port: 80
+            port: 8080
         resources:
           limits:
             memory: 100Mi
@@ -53,7 +66,7 @@ metadata:
 data:
   default.conf: |-
     server {
-      listen 80;
+      listen 8080;
 
       location /ping {
             access_log off;

12-deploying-containers/kubernetes/ingress-route.yml

@@ -12,7 +12,7 @@ spec:
     - kind: Service
       name: client-react-nginx
       namespace: default
-      port: 80
+      port: 8080
       scheme: http
   - kind: Rule
     match: Host(`docker-course-kubernetes.devopsdirective.com`) && PathPrefix(`/api/node`)