From 02933b7c5b6f630e1f6b57633d1f7a9c1fb12e8b Mon Sep 17 00:00:00 2001 From: sid palas Date: Fri, 17 Mar 2023 10:41:37 -0400 Subject: [PATCH] update deployment configs to use unprivledged nginx --- 12-deploying-containers/Makefile | 6 ++++++ 12-deploying-containers/docker-swarm/Makefile | 6 +++++- .../docker-swarm/docker-compose-prod.yml | 8 ++++---- .../docker-swarm/docker-swarm.yml | 8 ++++---- .../kubernetes/api-golang.yml | 2 +- .../kubernetes/api-node.yml | 2 +- .../kubernetes/client-react-nginx.yml | 19 ++++++++++++++++--- .../kubernetes/ingress-route.yml | 2 +- 8 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 12-deploying-containers/Makefile diff --git a/12-deploying-containers/Makefile b/12-deploying-containers/Makefile new file mode 100644 index 0000000..0f23bd4 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/12-deploying-containers/docker-swarm/Makefile b/12-deploying-containers/docker-swarm/Makefile index 6492fc9..824917b 100644 --- a/12-deploying-containers/docker-swarm/Makefile +++ b/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 - \ No newline at end of file + echo -n "postgres://postgres:foobarbaz@db:5432/postgres" | DOCKER_HOST=${DOCKER_HOST} docker secret create database-url - diff --git a/12-deploying-containers/docker-swarm/docker-compose-prod.yml b/12-deploying-containers/docker-swarm/docker-compose-prod.yml index 5946091..8835192 100644 --- a/12-deploying-containers/docker-swarm/docker-compose-prod.yml +++ b/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 diff --git a/12-deploying-containers/docker-swarm/docker-swarm.yml b/12-deploying-containers/docker-swarm/docker-swarm.yml index f7c1719..b4cef3e 100644 --- a/12-deploying-containers/docker-swarm/docker-swarm.yml +++ b/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 diff --git a/12-deploying-containers/kubernetes/api-golang.yml b/12-deploying-containers/kubernetes/api-golang.yml index 32d091f..6d915a9 100644 --- a/12-deploying-containers/kubernetes/api-golang.yml +++ b/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" diff --git a/12-deploying-containers/kubernetes/api-node.yml b/12-deploying-containers/kubernetes/api-node.yml index 0cd0b0b..a6a2440 100644 --- a/12-deploying-containers/kubernetes/api-node.yml +++ b/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" diff --git a/12-deploying-containers/kubernetes/client-react-nginx.yml b/12-deploying-containers/kubernetes/client-react-nginx.yml index 3e21f3f..66d60dc 100644 --- a/12-deploying-containers/kubernetes/client-react-nginx.yml +++ b/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; diff --git a/12-deploying-containers/kubernetes/ingress-route.yml b/12-deploying-containers/kubernetes/ingress-route.yml index cccc9f6..84e2256 100644 --- a/12-deploying-containers/kubernetes/ingress-route.yml +++ b/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`)