Skip to content

Commit

Permalink
Merge pull request #1618 from gettakaro/main-promotion
Browse files Browse the repository at this point in the history
  • Loading branch information
niekcandaele authored Oct 11, 2024
2 parents f8a8b0d + 2a571b7 commit 811ac8a
Show file tree
Hide file tree
Showing 16 changed files with 152 additions and 161 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.17.0
20.18.0
4 changes: 2 additions & 2 deletions containers/generic-app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.17.0-alpine AS builder
FROM node:20.18.0-alpine AS builder

ARG PACKAGE
ENV NODE_ENV=development
Expand All @@ -21,7 +21,7 @@ RUN npm run -w packages/${PACKAGE} build
# So with this command we prebuild library packages and make them available for later
RUN find packages -type d -name 'lib-*' -exec sh -c 'npm run -w {} build && mkdir -p libraries/{}/ && cp -r {}/dist libraries/{}/ && cp -r {}/package*.json libraries/{}/' \;

FROM node:20.17.0-alpine AS runner
FROM node:20.18.0-alpine AS runner

# Version 9+ is required to run npm scripts as root
RUN npm install -g npm@9
Expand Down
2 changes: 1 addition & 1 deletion containers/generic-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.17.0-alpine AS builder
FROM node:20.18.0-alpine AS builder

ARG PACKAGE
ENV NODE_ENV=development
Expand Down
4 changes: 2 additions & 2 deletions containers/takaro/dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20.17.0-bullseye
FROM node:20.18.0-bullseye

ENV NODE_ENV=development

Expand Down Expand Up @@ -32,4 +32,4 @@ ENV TAKARO_COMMIT=${TAKARO_COMMIT}
ENV TAKARO_BUILD_DATE=${TAKARO_BUILD_DATE}
ENV TAKARO_FULL_VERSION=${TAKARO_VERSION}-${TAKARO_COMMIT}-${TAKARO_BUILD_DATE}

CMD ["npm", "run", "-w", "packages/app-api", "domainInit", "&&", "npm", "run", "start:dev"]
CMD ["npm", "run", "start:dev"]
11 changes: 5 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"release:patch": "npm version patch --no-git-tag-version --workspaces && git add **/package.json; npm version patch --include-workspace-root --force"
},
"engines": {
"node": "20.17.0",
"npm": "10.8.3"
"node": "20.18.0",
"npm": "10.9.0"
},
"contributors": [
"Niek Candaele",
Expand Down
2 changes: 1 addition & 1 deletion packages/app-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "module",
"scripts": {
"start": "node --experimental-vm-modules --loader ../../node_modules/@takaro/util/dist/tracing.js dist/main.js",
"start:dev": "nodemon --exec 'npm run build && node --experimental-vm-modules --inspect=0.0.0.0:12001 --loader ../../node_modules/@takaro/util/dist/tracing.js dist/main.js' --config ../../nodemon.json",
"start:dev": "nodemon --exec 'npm run build && npm run domainInit && node --experimental-vm-modules --inspect=0.0.0.0:12001 --loader ../../node_modules/@takaro/util/dist/tracing.js dist/main.js' --config ../../nodemon.json",
"prestart:dev": "npm run db:migrate",
"preload": "node -e \"import('geolite2-redist').then(geolite => geolite.downloadDbs())\"",
"build": "tsc -p ./tsconfig.build.json",
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.8.0
7.9.0
Loading

0 comments on commit 811ac8a

Please sign in to comment.