chore: fix build process and code smells

raffles-interact · Dec 3, 2023 · ca284f0 · ca284f0
1 parent 6b8d778
commit ca284f0
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 21 deletions.
diff --git a/interapp-backend/bun.lockb b/interapp-backend/bun.lockb
diff --git a/interapp-backend/dev.Dockerfile b/interapp-backend/dev.Dockerfile
@@ -1,9 +1,10 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY . . 
 
-RUN bun install
+RUN bun install --frozen-lockfile
+ENV NODE_ENV development
 
 EXPOSE 3000
 CMD ["bun", "--watch", "api/routes/index.ts"]
diff --git a/interapp-backend/prod.Dockerfile b/interapp-backend/prod.Dockerfile
@@ -1,8 +1,9 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY . . 
-RUN bun install
+RUN bun install --production --frozen-lockfile
+ENV NODE_ENV production
 
 EXPOSE 3000
 CMD ["bun", "run", "api/routes/index.ts"]
diff --git a/interapp-backend/scheduler/dev.Dockerfile b/interapp-backend/scheduler/dev.Dockerfile
@@ -1,12 +1,14 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY . .
 
-RUN bun install
+RUN bun install --frozen-lockfile
 
 RUN apt-get update && apt-get install -y tzdata
 ENV TZ=Asia/Singapore
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
+RUN apt-get clean
 
+ENV NODE_ENV development
 CMD ["bun", "--watch", "scheduler/scheduler.ts"]
diff --git a/interapp-backend/scheduler/prod.Dockerfile b/interapp-backend/scheduler/prod.Dockerfile
@@ -1,13 +1,14 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY . .
 
-RUN bun install
+RUN bun install --production --frozen-lockfile
 
 RUN apt-get update && apt-get install -y tzdata
 ENV TZ=Asia/Singapore
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
+RUN ln -snf /usr/share/zoneinfo/"$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
+RUN apt-get clean
 
+ENV NODE_ENV production
 CMD ["bun", "run", "scheduler/scheduler.ts"]
diff --git a/interapp-backend/tests/config/test.Dockerfile b/interapp-backend/tests/config/test.Dockerfile
@@ -1,9 +1,9 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY  . . 
 
-RUN bun install
+RUN bun install --frozen-lockfile
 
 EXPOSE 1234
 CMD ["bun", "run", "api/routes/index.ts"]
diff --git a/interapp-backend/tests/unit/auth.test.ts b/interapp-backend/tests/unit/auth.test.ts
@@ -46,7 +46,7 @@ describe('Unit (auth)', () => {
           email: 'dskjfklsjf@jfndcdfs',
           verified: false,
           service_hours: 0,
-          permissions: expect.any(Array<Number>),
+          permissions: expect.any(Array<number>),
         },
       });
     });

diff --git a/interapp-backend/tests/unit/service.test.ts b/interapp-backend/tests/unit/service.test.ts
@@ -1,9 +1,7 @@
-import { UserModel } from '@models/user';
 import { AuthModel } from '@models/auth';
 import { ServiceModel } from '@models/service';
 import { describe, expect, test, afterAll, beforeAll } from 'bun:test';
 import { recreateDB } from '../utils/recreate_db';
-import appDataSource from '@utils/init_datasource';
 import { AttendanceStatus } from '@db/entities';
 
 describe('Unit (service)', () => {

diff --git a/interapp-frontend/bun.lockb b/interapp-frontend/bun.lockb
diff --git a/interapp-frontend/dev.Dockerfile b/interapp-frontend/dev.Dockerfile
@@ -1,9 +1,11 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY . .
 
-RUN bun install
+ENV NODE_ENV development
+RUN bun install --frozen-lockfile
+
 
 EXPOSE 3000
 CMD ["bun", "run", "dev"]
diff --git a/interapp-frontend/package.json b/interapp-frontend/package.json
@@ -27,6 +27,6 @@
     "eslint": "^8",
     "eslint-config-next": "14.0.1",
     "prettier": "^3.1.0",
-    "typescript": "^5"
+    "typescript": "^5.3.2"
   }
 }
diff --git a/interapp-frontend/prod.Dockerfile b/interapp-frontend/prod.Dockerfile
@@ -1,11 +1,13 @@
-FROM oven/bun:1.0.14
+FROM oven/bun:1.0.15
 WORKDIR /app
 
 COPY . .
 
-RUN bun install
 
+ENV NODE_ENV production
+RUN bun install --frozen-lockfile
 RUN bun run build
 
+
 EXPOSE 3000
 CMD ["bun", "run", "start"]