Skip to content

Commit

Permalink
Merge branch 'master' into UI-604
Browse files Browse the repository at this point in the history
  • Loading branch information
Ingvord committed Aug 20, 2024
2 parents 7d3a298 + 23b6906 commit d6f93bd
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/github-tag-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- release

env:
NODE_VERSION: 18.x
NODE_VERSION: 20.x
RELEASE_BRANCH: release

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Test
env:
NODE_VERSION: 18.x
NODE_VERSION: 20.x

on:
pull_request:
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
FROM node:18-alpine AS dev
FROM node:20-alpine AS dev

# Prepare app directory
WORKDIR /home/node/app
COPY . .

# Set up local user
RUN mkdir /home/node/app/dist
RUN npm install -g [email protected]

# Install dependencies

RUN npm install glob rimraf
RUN npm install

FROM node:18-alpine AS builder
FROM node:20-alpine AS builder

# Prepare app directory
RUN npm install -g [email protected]
WORKDIR /usr/src/app

# Set up local user
Expand All @@ -29,7 +27,7 @@ RUN npm run build
# Remove development dependencies
RUN npm prune --production

FROM node:18-alpine
FROM node:20-alpine

# Prepare app directory
WORKDIR /home/node/app
Expand Down
64 changes: 32 additions & 32 deletions package-lock.json

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

0 comments on commit d6f93bd

Please sign in to comment.