Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • jw_sonar
  • v6.0.0
  • bedran_exercise-list
  • ask-user-to-delete-exercises-on-duplicates
  • update-dependencies
  • main
  • jw_sonar_backup
  • add_route_assignments
  • 2.0.0
  • 2.1.0
  • 2.2.0
  • 3.0.0
  • 3.0.1
  • 3.1.0
  • 3.1.1
  • 3.1.2
  • 3.1.3
  • 3.2.0
  • 3.3.0
  • 3.4.0
  • 3.4.1
  • 3.4.2
  • 3.5.0
  • 3.5.1
  • 3.5.2
  • 3.5.3
  • 4.0.0
  • 4.1.0
  • 5.0.0
  • 5.0.1
  • 6.0.0-dev
  • v1.0.1
32 results

Target

Select target project
  • Dojo_Project_Nguyen / Backend / DojoBackendAPI
  • Dojo Project (HES-SO) / Projects / Backend / DojoBackendAPI
2 results
Select Git revision
  • jw_sonar
  • v6.0.0
  • bedran_exercise-list
  • ask-user-to-delete-exercises-on-duplicates
  • update-dependencies
  • main
  • jw_sonar_backup
  • add_route_assignments
  • 2.0.0
  • 2.1.0
  • 2.2.0
  • 3.0.0
  • 3.0.1
  • 3.1.0
  • 3.1.1
  • 3.1.2
  • 3.1.3
  • 3.2.0
  • 3.3.0
  • 3.4.0
  • 3.4.1
  • 3.4.2
  • 3.5.0
  • 3.5.1
  • 3.5.2
  • 3.5.3
  • 4.0.0
  • 4.1.0
  • 5.0.0
  • 5.0.1
  • 6.0.0-dev
  • v1.0.1
32 results
Show changes

Commits on Source 1

2 files
+ 12
− 12
Compare changes
  • Side-by-side
  • Inline

Files

Dockerfile_ExpressAPI

+11 −11
Original line number Original line Diff line number Diff line 
ARG BUILD_WORKDIR=/dojo/ExpressAPI

ARG BUILD_DEPLOY_WORKDIR=/dojo/ExpressAPI
@@ -7,13 +7,13 @@ FROM node:20-bullseye AS builder 
LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"

LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"

LABEL Description="Express API for Dojo - Build stage"

LABEL Description="Express API for Dojo - Build stage"





ARG BUILD_WORKDIR

ARG BUILD_DEPLOY_WORKDIR





# Create app directory

# Create app directory

ADD ExpressAPI/ ${BUILD_WORKDIR}/

ADD ExpressAPI/ ${BUILD_DEPLOY_WORKDIR}/

ADD .env ${BUILD_WORKDIR}/.env

ADD .env ${BUILD_DEPLOY_WORKDIR}/.env





WORKDIR ${BUILD_WORKDIR}

WORKDIR ${BUILD_DEPLOY_WORKDIR}





# Install app dependencies

# Install app dependencies

RUN npm install

RUN npm install
@@ -28,13 +28,13 @@ FROM node:20-bullseye 
LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"

LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"

LABEL Description="Express API for Dojo - Run stage"

LABEL Description="Express API for Dojo - Run stage"





ARG BUILD_WORKDIR

ARG BUILD_DEPLOY_WORKDIR





COPY --from=builder ${BUILD_WORKDIR}/node_modules ./node_modules

COPY --from=builder ${BUILD_DEPLOY_WORKDIR}/node_modules ${BUILD_DEPLOY_WORKDIR}/node_modules

COPY --from=builder ${BUILD_WORKDIR}/package*.json ./

COPY --from=builder ${BUILD_DEPLOY_WORKDIR}/package*.json ${BUILD_DEPLOY_WORKDIR}/

COPY --from=builder ${BUILD_WORKDIR}/dist ./dist

COPY --from=builder ${BUILD_DEPLOY_WORKDIR}/dist ${BUILD_DEPLOY_WORKDIR}/dist

COPY --from=builder ${BUILD_WORKDIR}/prisma ./prisma

COPY --from=builder ${BUILD_DEPLOY_WORKDIR}/prisma ${BUILD_DEPLOY_WORKDIR}/prisma

COPY --from=builder ${BUILD_WORKDIR}/.env ./.env

COPY --from=builder ${BUILD_DEPLOY_WORKDIR}/.env ${BUILD_DEPLOY_WORKDIR}/.env





EXPOSE 30992

EXPOSE 30992

ExpressAPI/package.json

+1 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ 
        "database:seed"     : "npx prisma db seed",

        "database:seed"     : "npx prisma db seed",

        "database:deploy"   : "npm run database:migrate && npm run database:seed",

        "database:deploy"   : "npm run database:migrate && npm run database:seed",

        "start:dev"         : "npx nodemon src/app.ts",

        "start:dev"         : "npx nodemon src/app.ts",

        "start:prod"        : "NODE_ENV=production npx node --max-http-header-size=1048576 dist/app.js",

        "start:prod"        : "NODE_ENV=production npx node --max-http-header-size=1048576 dist/src/app.js",

        "start:migrate:prod": "npm run database:deploy && npm run start:prod"

        "start:migrate:prod": "npm run database:deploy && npm run start:prod"

    },

    },

    "prisma"         : {

    "prisma"         : {