fix: update Dockerfiles and Makefile for consistency and improved build process

Author: DavidAsrorxonov

05-example-web-application/api-node/Dockerfile

@@ -1,9 +1,9 @@
-FROM node:19.6-alpine
-
-WORKDIR /usr/src/app
+FROM node:19.6-bullseye-slim
 
 ENV NODE_ENV=production
 
+WORKDIR /usr/src/app
+
 COPY package*.json ./
 
 RUN npm ci --only=production

06-building-container-images/client-react/Dockerfile.3

@@ -8,9 +8,7 @@ WORKDIR /usr/src/app
 COPY package*.json ./
 
 # Use cache mount to speed up install of existing dependencies
-RUN --mount=type=cache,target=/usr/src/app/.npm \
-  npm set cache /usr/src/app/.npm && \
-  npm install
+RUN npm ci
 
 COPY . .
 

07-container-registries/Makefile

@@ -6,18 +6,18 @@ build:
 # https://docs.docker.com/engine/reference/commandline/login/
 .PHONY: push-dockerhub
 push-dockerhub:
-	docker tag my-scratch-image sidpalas/my-scratch-image # defaults to latest
-	docker push sidpalas/my-scratch-image
+	docker tag my-scratch-image davidasrorxonov/my-scratch-image # defaults to latest
+	docker push davidasrorxonov/my-scratch-image
 
-	docker tag my-scratch-image sidpalas/my-scratch-image:abc-123
-	docker push sidpalas/my-scratch-image:abc-123
+	docker tag my-scratch-image davidasrorxonov/my-scratch-image:abc-123
+	docker push davidasrorxonov/my-scratch-image:abc-123
 
 # Have to authenticate to ghcr.io first
 # https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry#authenticating-to-the-container-registry
 .PHONY: push-github-packages
 push-github-packages:
-	docker tag my-scratch-image ghcr.io/sidpalas/my-scratch-image # defaults to latest
-	docker push ghcr.io/sidpalas/my-scratch-image
+	docker tag my-scratch-image ghcr.io/davidasrorxonov/my-scratch-image # defaults to latest
+	docker push ghcr.io/davidasrorxonov/my-scratch-image
 
-	docker tag my-scratch-image ghcr.io/sidpalas/my-scratch-image:abc-123 # defaults to latest
-	docker push ghcr.io/sidpalas/my-scratch-image:abc-123
+	docker tag my-scratch-image ghcr.io/davidasrorxonov/my-scratch-image:abc-123 # defaults to latest
+	docker push ghcr.io/davidasrorxonov/my-scratch-image:abc-123

08-running-containers/client-react/vite.config.js

@@ -1,24 +1,24 @@
-import { defineConfig } from 'vite';
-import react from '@vitejs/plugin-react-swc';
-import dns from 'dns';
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react-swc";
+import dns from "dns";
 
-dns.setDefaultResultOrder('verbatim');
+dns.setDefaultResultOrder("verbatim");
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
   server: {
     proxy: {
-      '/api/golang': {
-        target: 'http://api-golang:8080',
+      "/api/golang": {
+        target: "http://api-golang:8080",
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api\/golang/, ''),
+        rewrite: (path) => path.replace(/^\/api\/golang/, ""),
         secure: false,
       },
-      '/api/node': {
-        target: 'http://api-node:3000',
+      "/api/node": {
+        target: "http://api-node:3000",
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api\/node/, ''),
+        rewrite: (path) => path.replace(/^\/api\/node/, ""),
         secure: false,
       },
     },

08-running-containers/docker-compose.yml

@@ -1,3 +1,4 @@
+version: "3.9"
 services:
   client-react-vite:
     image: client-react-vite
@@ -12,27 +13,21 @@ services:
     ports:
       - 5173:5173
   client-react-nginx:
-    labels:
-      shipyard.primary-route: true
-      shipyard.route: '/'
     image: client-react-nginx
     build:
       context: ../05-example-web-application/client-react/
-      dockerfile: ../../06-building-container-images/client-react/Dockerfile.5
+      dockerfile: ../../05-example-web-application/client-react/Dockerfile
     init: true
     networks:
       - frontend
     ports:
       - 80:8080
     restart: unless-stopped
   api-node:
-    labels:
-      shipyard.route: '/api/node/'
-      shipyard.route.rewrite: true
     image: api-node
     build:
       context: ../05-example-web-application/api-node/
-      dockerfile: ../../06-building-container-images/api-node/Dockerfile.7
+      dockerfile: ../../05-example-web-application/api-node/Dockerfile
     init: true
     depends_on:
       - db
@@ -44,25 +39,6 @@ services:
     ports:
       - 3000:3000
     restart: unless-stopped
-  api-golang:
-    labels:
-      shipyard.route: '/api/golang/'
-      shipyard.route.rewrite: true
-    image: api-golang
-    build:
-      context: ../05-example-web-application/api-golang/
-      dockerfile: ../../06-building-container-images/api-golang/Dockerfile.6
-    init: true
-    depends_on:
-      - db
-    environment:
-      - DATABASE_URL=postgres://postgres:foobarbaz@db:5432/postgres
-    networks:
-      - frontend
-      - backend
-    ports:
-      - 8080:8080
-    restart: unless-stopped
   db:
     image: postgres:15.1-alpine
     volumes:
@@ -72,7 +48,7 @@ services:
     networks:
       - backend
     ports:
-      - 5432:5432
+      - 5433:5432
 volumes:
   pgdata:
 networks: