.drone.yml

@@ -1,100 +1,20 @@
 ---
 kind: pipeline
-name: tests:node_latest
+name: tests:latest
 clone:
   disable: true
 steps:
-  - name: checkout pr
+- name: checkout pr
-    image: alpine/git
+  image: alpine/git
-    commands:
+  commands:
-      - git clone $DRONE_REMOTE_URL .
+  - git clone $DRONE_REMOTE_URL .
-      - git checkout $DRONE_SOURCE_BRANCH
+  - git checkout $DRONE_SOURCE_BRANCH
-      - mv .env.ci .env
+  - mv .env.ci .env
-  - name: run tests
+- name: run tests
-    image: node:alpine
+  image: node:alpine
-    commands:
+  commands:
-      - yarn
+  - yarn
-      - yarn test:ci
+  - yarn test:ci
 trigger:
   event:
-    - pull_request
+  - pull_request
-
----
-kind: pipeline
-type: docker
-name: build:dev
-
-steps:
-  - name: build featurebranch
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: DOCKER_REGISTRY_USER
-      password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
-      repo: registry.odit.services/lfk/backend
-      tags:
-        - dev
-      registry: registry.odit.services
-    when:
-      branch:
-        - dev
-      event:
-        - push
-
-trigger:
-  branch:
-    - dev
-  event:
-    - push
-
----
-kind: pipeline
-type: docker
-name: build:latest
-
-steps:
-  - name: build featurebranch
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: DOCKER_REGISTRY_USER
-      password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
-      repo: registry.odit.services/lfk/backend
-      tags:
-        - latest
-      registry: registry.odit.services
-
-trigger:
-  branch:
-    - main
-  event:
-    - push
-
----
-kind: pipeline
-type: docker
-name: build:tags
-
-steps:
-  - name: build featurebranch
-    image: plugins/docker
-    depends_on: [clone]
-    settings:
-      username:
-        from_secret: DOCKER_REGISTRY_USER
-      password:
-        from_secret: DOCKER_REGISTRY_PASSWORD
-      repo: registry.odit.services/lfk/backend
-      tags:
-        - $DRONE_TAG
-      registry: registry.odit.services
-
-trigger:
-  branch:
-    - main
-  event:
-    - tag

.env.ci

@@ -5,4 +5,4 @@ DB_PORT=unused
 DB_USER=unused
 DB_PASSWORD=bla
 DB_NAME=./test.sqlite
-NODE_ENV=dev
+NODE_ENV=production

Dockerfile

@@ -1,16 +1,6 @@
-# Typescript Build
+FROM node:alpine
-FROM node:14.15.1-alpine3.12
 WORKDIR /app
-COPY package.json ./
+COPY ./package.json ./
-RUN npm i -g pnpm
+RUN yarn
-RUN pnpm i
+COPY ./ ./
-COPY tsconfig.json ormconfig.js ./
+ENTRYPOINT [ "yarn","dev" ]
-COPY src ./src
-RUN pnpm run build
-# final image
-FROM node:14.15.1-alpine3.12
-COPY package.json ormconfig.js ./
-RUN npm i -g pnpm
-RUN pnpm i --prod
-COPY --from=0 /app/dist dist
-ENTRYPOINT ["node", "dist/app.js"]

docker-compose.yml

@@ -6,26 +6,18 @@ services:
       - 4010:4010
     environment:
       APP_PORT: 4010
-      DB_TYPE: sqlite
+      DB_TYPE: postgres
-      DB_HOST: bla
+      DB_HOST: backend_db
-      DB_PORT: bla
+      DB_PORT: 5432 
-      DB_USER: bla
+      DB_USER: lfk
-      DB_PASSWORD: bla
+      DB_PASSWORD: changeme
-      DB_NAME: dev.sqlite
+      DB_NAME: lfk
       NODE_ENV: production
-      # APP_PORT: 4010
+  backend_db:
-      # DB_TYPE: postgres
+    image: postgres:11-alpine
-      # DB_HOST: backend_db
+    environment:
-      # DB_PORT: 5432
+      POSTGRES_DB: lfk
-      # DB_USER: lfk
+      POSTGRES_PASSWORD: changeme
-      # DB_PASSWORD: changeme
+      POSTGRES_USER: lfk
-      # DB_NAME: lfk
+    ports:
-      # NODE_ENV: production
+      - 5432:5432
-  # backend_db:
-  #   image: postgres:11-alpine
-  #   environment:
-  #     POSTGRES_DB: lfk
-  #     POSTGRES_PASSWORD: changeme
-  #     POSTGRES_USER: lfk
-  #   ports:
-  #     - 5432:5432

ormconfig.js

@@ -1,16 +0,0 @@
-const dotenv = require('dotenv');
-dotenv.config();
-//
-const SOURCE_PATH = process.env.NODE_ENV === 'production' ? 'dist' : 'src';
-module.exports = {
-	type: process.env.DB_TYPE,
-	host: process.env.DB_HOST,
-	port: process.env.DB_PORT,
-	username: process.env.DB_USER,
-	password: process.env.DB_PASSWORD,
-	database: process.env.DB_NAME,
-	// entities: ["src/**/entities/*.ts"],
-	entities: [ `${SOURCE_PATH}/**/entities/*{.ts,.js}` ],
-	seeds: [ `${SOURCE_PATH}/**/seeds/*{.ts,.js}` ]
-	// seeds: ['src/seeds/*.ts'],
-};

ormconfig.ts

@@ -0,0 +1,13 @@
+import { config } from 'dotenv';
+config();
+
+export default {
+	type: process.env.DB_TYPE,
+	host: process.env.DB_HOST,
+	port: process.env.DB_PORT,
+	username: process.env.DB_USER,
+	password: process.env.DB_PASSWORD,
+	database: process.env.DB_NAME,
+	entities: ["src/models/entities/*.ts"],
+	seeds: ['src/seeds/*.ts'],
+};

package.json

@@ -32,7 +32,9 @@
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
+    "helmet": "^4.2.0",
     "jsonwebtoken": "^8.5.1",
+    "multer": "^1.4.2",
     "mysql": "^2.18.1",
     "pg": "^8.5.1",
     "reflect-metadata": "^0.1.13",
@@ -42,20 +44,23 @@
     "typeorm": "^0.2.29",
     "typeorm-routing-controllers-extensions": "^0.2.0",
     "typeorm-seeding": "^1.6.1",
-    "sqlite3": "^5.0.0",
     "uuid": "^8.3.1"
   },
   "devDependencies": {
     "@types/cors": "^2.8.8",
+    "@types/dotenv": "^8.2.0",
     "@types/express": "^4.17.9",
     "@types/jest": "^26.0.16",
     "@types/jsonwebtoken": "^8.5.0",
+    "@types/multer": "^1.4.4",
     "@types/node": "^14.14.9",
     "@types/swagger-ui-express": "^4.1.2",
     "@types/uuid": "^8.3.0",
     "axios": "^0.21.0",
+    "dotenv-safe": "^8.2.0",
     "jest": "^26.6.3",
     "nodemon": "^2.0.6",
+    "sqlite3": "^5.0.0",
     "start-server-and-test": "^1.11.6",
     "ts-jest": "^26.4.4",
     "ts-node": "^9.0.0",
@@ -75,6 +80,7 @@
     "ignore": [
       "src/tests/*",
       "docs/*"
-    ]
+    ],
+    "delay": "2500"
   }
 }

src/app.ts

@@ -6,14 +6,13 @@ import { config, e as errors } from './config';
 import loaders from "./loaders/index";
 import { ErrorHandler } from './middlewares/ErrorHandler';
 
-const CONTROLLERS_FILE_EXTENSION = process.env.NODE_ENV === 'production' ? 'js' : 'ts';
 const app = createExpressServer({
   authorizationChecker: authchecker,
   middlewares: [ErrorHandler],
   development: config.development,
   cors: true,
   routePrefix: "/api",
-  controllers: [`${__dirname}/controllers/*.${CONTROLLERS_FILE_EXTENSION}`],
+  controllers: [__dirname + "/controllers/*.ts"],
 });
 
 async function main() {

tsconfig.json

@@ -3,7 +3,7 @@
     "target": "ES2020",
     "module": "commonjs",
     "rootDir": "./src",
-    "outDir": "./dist",
+    "outDir": "./build",
     "esModuleInterop": true,
     "strict": false,
     "experimentalDecorators": true,