Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
DojoBackendAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dojo Project (HES-SO)
Projects
Backend
DojoBackendAPI
Compare revisions
a89a7e763a73b72a6c7c586132df0ba3126d19e0 to b490fbea10fd90623bf04c8ae8c102a0a91b58d3
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
dojo_project/projects/backend/dojobackendapi
Select target project
No results found
b490fbea10fd90623bf04c8ae8c102a0a91b58d3
Select Git revision
Branches
add_route_assignments
ask-user-to-delete-exercises-on-duplicates
bedran_exercise-list
jw_sonar
jw_sonar_backup
main
update-dependencies
v6.0.0
Tags
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
Swap
Target
dojo_project/projects/backend/dojobackendapi
Select target project
Dojo_Project_Nguyen/backend/dojobackendapi
dojo_project/projects/backend/dojobackendapi
2 results
a89a7e763a73b72a6c7c586132df0ba3126d19e0
Select Git revision
Branches
add_route_assignments
ask-user-to-delete-exercises-on-duplicates
bedran_exercise-list
jw_sonar
jw_sonar_backup
main
update-dependencies
v6.0.0
Tags
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
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (1)
Package => Bug fix: add src in dist path
· b490fbea
michael.minelli
authored
1 year ago
b490fbea
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile_ExpressAPI
+11
-11
11 additions, 11 deletions
Dockerfile_ExpressAPI
ExpressAPI/package.json
+1
-1
1 addition, 1 deletion
ExpressAPI/package.json
with
12 additions
and
12 deletions
Dockerfile_ExpressAPI
View file @
b490fbea
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 Description="Express API for Dojo - Build stage"
ARG BUILD_WORKDIR
ARG BUILD_
DEPLOY_
WORKDIR
# Create app directory
ADD ExpressAPI/ ${BUILD_WORKDIR}/
ADD .env ${BUILD_WORKDIR}/.env
ADD ExpressAPI/ ${BUILD_
DEPLOY_
WORKDIR}/
ADD .env ${BUILD_
DEPLOY_
WORKDIR}/.env
WORKDIR ${BUILD_WORKDIR}
WORKDIR ${BUILD_
DEPLOY_
WORKDIR}
# Install app dependencies
RUN npm install
...
...
@@ -28,13 +28,13 @@ FROM node:20-bullseye
LABEL maintainer="Michaël Minelli <michael-jean.minelli@hesge.ch>"
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_WORKDIR}/package*.json
.
/
COPY --from=builder ${BUILD_WORKDIR}/dist
.
/dist
COPY --from=builder ${BUILD_WORKDIR}/prisma
.
/prisma
COPY --from=builder ${BUILD_WORKDIR}/.env
.
/.env
COPY --from=builder ${BUILD_
DEPLOY_
WORKDIR}/node_modules
${BUILD_DEPLOY_WORKDIR}
/node_modules
COPY --from=builder ${BUILD_
DEPLOY_
WORKDIR}/package*.json
${BUILD_DEPLOY_WORKDIR}
/
COPY --from=builder ${BUILD_
DEPLOY_
WORKDIR}/dist
${BUILD_DEPLOY_WORKDIR}
/dist
COPY --from=builder ${BUILD_
DEPLOY_
WORKDIR}/prisma
${BUILD_DEPLOY_WORKDIR}
/prisma
COPY --from=builder ${BUILD_
DEPLOY_
WORKDIR}/.env
${BUILD_DEPLOY_WORKDIR}
/.env
EXPOSE 30992
...
...
This diff is collapsed.
Click to expand it.
ExpressAPI/package.json
View file @
b490fbea
...
...
@@ -12,7 +12,7 @@
"database:seed"
:
"npx prisma db seed"
,
"database:deploy"
:
"npm run database:migrate && npm run database:seed"
,
"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"
},
"prisma"
:
{
...
...
This diff is collapsed.
Click to expand it.