[SCSE-247] Build merch app as docker image (#100)

* Added Dockerfile, fixed package.lock and tsconfig

* Fixed CD pipeline for merch image build

* Fixed docker compose merch image

* Updated Dockerfile

* Directory clean up

* bump turbo version

* update gitignore

* temp fix build errors

* fix merch docker image

* add color to turbo build step in dockerfile

* update merch deps in package.json

---------

Co-authored-by: Dyllon <dyllon.g@outlook.com>

.github/workflows/cd-staging.yml

@@ -30,11 +30,37 @@ jobs:
             ghcr.io/${{ github.repository_owner }}/website/cms:${{ github.sha }}
             ghcr.io/${{ github.repository_owner }}/website/cms:latest
 
+
+  build-merch:
+    name: Build Merch Docker Image
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          file: ./apps/merch/Dockerfile
+          context: .
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/website/merch:${{ github.sha }}
+            ghcr.io/${{ github.repository_owner }}/website/merch:latest
+
   deploy-to-staging:
     name: Deploy To Staging
     runs-on: ubuntu-22.04
     needs:
       - build-cms
+      - build-merch
     steps:
       - name: Checkout repo
         uses: actions/checkout@v3

.gitignore

@@ -12,6 +12,11 @@ node_modules
 # testing
 coverage
 
+# build
+**/build
+**/out
+**/dist
+
 # next.js
 .next/
 out/

apps/merch/docker/Dockerfile

@@ -0,0 +1,53 @@
+FROM node:16-alpine AS builder
+
+RUN apk add --no-cache libc6-compat
+RUN apk update
+
+# Set working directory
+WORKDIR /app
+RUN yarn global add turbo
+COPY . .
+RUN rm -rf **/node_modules **/build **/dist **/out **/.turbo
+RUN rm -rf **/.env
+RUN turbo prune --scope=merch --docker
+
+FROM node:16-alpine AS installer
+# Add lockfile and package.json's of isolated subworkspace
+RUN apk add --no-cache libc6-compat
+RUN apk update
+WORKDIR /app
+
+# First install dependencies (as they change less often)
+#COPY .gitignore .gitignore
+COPY --from=builder /app/out/json/ .
+COPY --from=builder /app/out/yarn.lock ./yarn.lock
+RUN yarn install
+
+# Build the project and its dependencies
+COPY --from=builder /app/out/full/ .
+COPY turbo.json turbo.json
+RUN yarn turbo run build --filter=merch... --color
+
+FROM node:16-alpine AS runner
+
+WORKDIR /app
+
+# Don't run production as root
+#RUN addgroup --system --gid 1001 expressjs
+#RUN adduser --system --uid 1001 expressjs
+#USER expressjs
+
+COPY --from=installer /app .
+RUN rm -rf /app/apps/merch/src
+
+WORKDIR /app/apps/merch
+
+#ENV NODE_ENV=production
+#ENV PAYLOAD_CONFIG_PATH=dist/payload.config.js
+#ENV BABEL_DISABLE_CACHE=1
+
+#EXPOSE 80
+EXPOSE 7001
+
+CMD ["node", "dist/index.js"]
+

apps/merch/package.json

@@ -2,26 +2,30 @@
   "name": "merch",
   "description": "NTU SCSE Merch Backend",
   "version": "0.1.0",
-  "main": "dist/server.js",
+  "main": "dist/index.js",
   "license": "Apache-2.0",
   "scripts": {
-    "dev": "nodemon src/server.ts",
+    "build": "tsup src/index.ts --format cjs",
+    "start": "node dist/index.js",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "dev": "tsup src/index.ts --format cjs --watch --onSuccess \"node dist/index.js\"",
     "lint": "TIMING=1 eslint \"**/*.ts*\"",
     "lint:fix": "TIMING=1 eslint --fix \"**/*.ts*\""
   },
   "dependencies": {
-    "express": "^4.17.1"
+    "express": "^4.17.1",
+    "nodelogger": "*"
   },
   "devDependencies": {
     "@types/cookie-parser": "^1.4.3",
     "@types/express": "^4.17.9",
     "@types/morgan": "^1.9.4",
     "cookie-parser": "^1.4.6",
     "morgan": "^1.10.0",
-    "nodelogger": "*",
     "nodemon": "^2.0.6",
     "ts-node": "^9.1.1",
     "tsconfig": "*",
+    "tsup": "^6.7.0",
     "types": "*",
     "typescript": "^4.8.4",
     "winston": "^3.8.2"

deployments/staging/docker-compose.yml

@@ -49,7 +49,6 @@ services:
       - "traefik.http.routers.cms.rule=Host(`cms.staging.ntuscse.com`, `13.213.116.60`, `localhost`)"
       - "traefik.http.routers.cms.entrypoints=websecure"
       - "traefik.http.routers.cms.tls.certresolver=myresolver"
-
   mongo:
     container_name: mongo
     image: mongo:latest
@@ -62,7 +61,7 @@ services:
 
   merch:
     container_name: merch
-    image: nginx
+    image: ghcr.io/ntuscse/website/merch:latest
     networks:
       cms_network:
         ipv4_address: 10.5.0.4

package.json

@@ -23,7 +23,7 @@
   "devDependencies": {
     "eslint-config-custom": "*",
     "prettier": "^2.8.1",
-    "turbo": "^1.8.2"
+    "turbo": "^1.10.1"
   },
   "engines": {
     "node": ">=16.0.0",

packages/nodelogger/package.json

@@ -1,10 +1,18 @@
 {
   "name": "nodelogger",
   "version": "0.0.1",
-  "main": "index.ts",
-  "types": "index.ts",
+  "private": true,
+  "main": "./dist/index.js",
+  "source": "./src/index.ts",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist/**"
+  ],
   "license": "Apache-2.0",
   "scripts": {
+    "build": "tsc",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist",
+    "dev": "tsc -w",
     "lint": "TIMING=1 eslint \"**/*.ts*\"",
     "lint:fix": "TIMING=1 eslint --fix \"**/*.ts*\""
   },
@@ -14,5 +22,10 @@
     "morgan": "^1.10.0",
     "winston": "^3.8.2"
   },
-  "devDependencies": {}
+  "devDependencies": {
+    "eslint": "^7.32.0",
+    "eslint-config-custom": "*",
+    "tsconfig": "*",
+    "typescript": "^4.5.2"
+  }
 }

packages/nodelogger/tsconfig.json

@@ -1,8 +1,33 @@
 {
   "extends": "tsconfig/node.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src",
+    "module": "commonjs",
+    "target": "es2017",
+    "lib": [
+      "es2017",
+      "esnext.asynciterable"
+    ],
+    "sourceMap": true,
+    "declaration": true,
+    "strict": true,
+    "noImplicitAny": true,
+    "moduleResolution": "node",
+    "baseUrl": "./",
+    "paths": {
+      "*": [
+        "node_modules/*",
+        "src/types/*"
+      ]
+    },
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true
+  },
   "include": [
-    "**/*.js",
-    "**/*.ts",
+    "src/**/*.ts"
   ],
   "exclude": [
     "dist",

packages/schemas/package.json

@@ -1,4 +1,5 @@
 {
   "name": "schemas",
-  "description": "Schemas for graphql and other things"
+  "description": "Schemas for graphql and other things",
+  "version": "0.0.1"
 }

packages/tsconfig/node.json

@@ -8,7 +8,7 @@
     "target": "es6",
     "moduleResolution": "node",
     "sourceMap": true,
-    "outDir": "dist"
+    "outDir": "./dist"
   },
   "lib": ["esnext"]
 }