Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Karel/use rewired template #64

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
FROM semtech/mu-javascript-template:1.8.0
#FROM semtech/mu-javascript-template:1.8.0 AS base
FROM local-js-template AS base
LABEL maintainer="karel.kremer@redpencil.io"
FROM base AS test
# added vitest as a dev dependency and since the template builds with NODE_ENV=production it's discarded
# need to run npm i again with NODE_ENV=test
RUN cd /usr/src/app/app/ && NODE_ENV=test npm i
RUN cd /usr/src/app/app/ && NODE_ENV=test npm run test
FROM base AS production
2 changes: 1 addition & 1 deletion app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { loadFormsFromConfig } from './services/forms-from-config';
loadFormsFromConfig();

app.get('/', async (_req, res) => {
res.send({ status: 'ok' });
res.send({ status: 'ok!' });
});

app.use('/', formInstanceRouter);
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ services:
- ../app-lokaal-mandatenbeheer/config/form-content:/config
- ./:/app
# ignore app/dist because this is where we map the built files to, otherwise we get an infinite loop of creating files (on mac)
- /app/dist
- ./dist:/build/
# - /app/dist
# - ./dist:/build/
networks:
- debug
networks:
Expand Down
Loading