new build for docker

.dockerignore

@@ -1,5 +1,4 @@
 Makefile
-docker
 README.md
 docs
 .env
@@ -8,4 +7,4 @@ docs
 .idea
 node_modules
 nx
-.vscode
+.vscode

.github/workflows/docker_build_push.yml

@@ -2,15 +2,15 @@ name: Create and publish a Docker image
 
 # Configures this workflow to run every time a change is pushed to the branch called `release`.
 on:
+  workflow_dispatch:
   push:
     branches:
-      - '**'
+      - 'main'
     tags:
-      - 'v*.*.*'
-
-# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
-env:
-  IMAGE_NAME: ${{ github.repository }}
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
@@ -20,66 +20,39 @@ jobs:
     permissions:
       contents: read
       packages: write
-      #
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       # Uses the `docker/login-action` action to log in to the Container registry using the account and
       # password that will publish the packages. Once published, the packages are scoped to the account defined here.
       - name: Log in to the Container registry
-        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.DOCKER_HUB_USER }}
           password: ${{ secrets.DOCKER_HUB_TOKEN }}
 
-      - name: What branch is this?
-        run: echo "BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV
 
       # This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and
       # labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be
       # referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
+        uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      #      - name: Extract metadata (tags, labels) for Docker
-      #        id: meta
-      #        uses: docker/metadata-action@v5
-      #        with:
-      #          # list of Docker images to use as base name for tags
-      #          images: |
-      #            name/app
-      #          # generate Docker tags based on the following events/attributes
-      #          tags: |
-      #            type=schedule
-      #            type=ref,event=branch
-      #            type=ref,event=pr
-      #            type=semver,pattern={{version}}
-      #            type=semver,pattern={{major}}.{{minor}}
-      #            type=semver,pattern={{major}}
-      #            type=sha
+          images: ${{ env.REGISTRY || "docker.io" }}/${{ env.IMAGE_NAME || github.repository }}
 
-      - name: Set REF_NAME variable
-        run: |
-          REF=${{ github.ref }}
-          if [[ "$REF" =~ ^refs/tags/ ]]; then
-          echo "REF_NAME=${REF#refs/tags/}" >> $GITHUB_ENV
-          else
-          echo "REF_NAME=${REF#refs/heads/}" >> $GITHUB_ENV
-          fi
 
       # This step uses the `docker/build-push-action` action to build the image, based on your
       # repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
       # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
       # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
-      - name: Build and push Docker image for API
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+      - name: Build and push
+        uses: docker/build-push-action@v5
         with:
           context: .
+          push: ${{ github.event_name != 'pull_request' }}
           file: docker/deployments/api.dockerfile
-          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

apps/api/src/config/typeorm.config.ts

@@ -17,7 +17,13 @@ export const config = {
   entities: [__dirname + '/../**/*.entity.{js,ts}'],
   migrations: [join(__dirname, '..', 'migrations', '*.{ts,js}')],
   autoLoadEntities: true,
-  synchronize: false
+  synchronize: false,
+  ssl: process.env.DATABASE_CERT
+    ? {
+        rejectUnauthorized: false,
+        ca: String(process.env.DATABASE_CERT)
+      }
+    : false
 }
 
 export const typeOrmConfig = registerAs('typeorm', () => config)

docker/deployments/api.dockerfile

@@ -1,17 +1,46 @@
-FROM node:20 as production
+FROM ubuntu:22.04
 
+ARG NODE_MAJOR=18
 ARG NODE_ENV=production
 ENV NODE_ENV=${NODE_ENV}
+ENV TZ=UTC
+
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+RUN apt-get update
+RUN apt-get install -y ca-certificates curl gnupg supervisor
+RUN mkdir -p /etc/apt/keyrings
+RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
+RUN apt-get update
+RUN apt-get install nodejs -y
+RUN npm install -g npm
+RUN npm install -g yarn
+
+RUN apt-get install -y zip unzip supervisor libcap2-bin libpng-dev
+RUN apt-get -y autoremove
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 WORKDIR /app
 
-COPY package*.json ./
+COPY ./package.json ./
 
-RUN npm install -g yarn
-RUN yarn
+RUN yarn install --production=false
+RUN yarn global add nx
 
 COPY . .
 
+RUN nx repair
+
+RUN nx run api:build:production
+
+COPY ./docker/deployments/start-container /usr/local/bin/start-container
+COPY ./docker/deployments/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+RUN chmod +x /usr/local/bin/start-container
+
 EXPOSE 3000
 
-CMD ["nx", "run", "api:production"]
+#ENTRYPOINT ["start-container"]
+ENTRYPOINT ["nx", "run", "api:serve"]
+#ENTRYPOINT ["bash"]

docker/deployments/start-container

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf

docker/deployments/supervisord.conf

@@ -0,0 +1,18 @@
+[supervisord]
+nodaemon=true
+user=root
+logfile=/var/log/supervisor/supervisord.log
+pidfile=/var/run/supervisord.pid
+
+[program:api]
+command=node /app/dist/apps/api/src/main.js
+autostart=true
+autorestart=true
+startretries=5
+numprocs=1
+startsecs=0
+process_name=%(program_name)s_%(process_num)02d
+stderr_logfile=/var/log/supervisor/%(program_name)s_stderr.log
+stderr_logfile_maxbytes=10MB
+stdout_logfile=/var/log/supervisor/%(program_name)s_stdout.log
+stdout_logfile_maxbytes=10MB

nx.json

@@ -4,7 +4,10 @@
     "build": {
       "cache": true,
       "dependsOn": ["^build"],
-      "inputs": ["production", "^production"]
+      "inputs": ["production", "^production"],
+      "options": {
+        "generatePackageJson": true
+      }
     },
     "lint": {
       "cache": true,

package.json

@@ -75,19 +75,19 @@
     "@nestjs/cli": "^10.2.1",
     "@nestjs/schematics": "^10.0.1",
     "@nestjs/testing": "^10.0.2",
-    "@nx/cypress": "17.1.1",
-    "@nx/detox": "17.2.3",
-    "@nx/eslint": "17.0.3",
+    "@nx/cypress": "17.0.1",
+    "@nx/detox": "17.0.1",
+    "@nx/eslint": "17.0.1",
     "@nx/eslint-plugin": "17.0.1",
-    "@nx/expo": "^17.2.3",
-    "@nx/jest": "17.2.3",
-    "@nx/js": "17.2.3",
-    "@nx/nest": "17.1.2",
+    "@nx/expo": "^17.0.1",
+    "@nx/jest": "17.0.1",
+    "@nx/js": "17.0.1",
+    "@nx/nest": "17.0.1",
     "@nx/next": "^17.0.1",
     "@nx/node": "17.0.1",
     "@nx/react": "^17.0.1",
-    "@nx/webpack": "17.1.1",
-    "@nx/workspace": "17.1.1",
+    "@nx/webpack": "17.0.1",
+    "@nx/workspace": "17.0.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
     "@svgr/webpack": "^8.0.1",
     "@swc-node/register": "~1.6.7",