Merge branch 'master' into snyk-upgrade-836c5a794a4ba28cda063e5459b4c4da

ludeknovy · Aug 30, 2024 · c35ce27 · c35ce27
2 parents 012e96a + 7b22dc5
commit c35ce27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,13 +14,7 @@ jobs:
       - name: Install modules
         run: npm install
       - name: Build the docker-compose stack
-        run: docker-compose -f docker-compose.testing.yaml up -d
-      # - name: Run contract tests
-      #   run: npm run test:contract
-      #   env:
-      #     ENVIRONMENT: CI
-      #     JWT_TOKEN: 123
-      #     JWT_TOKEN_LOGIN: 456
+        run: docker compose -f docker-compose.testing.yaml up -d
       - name: Run integration tests
         run: npm run test:integration
         env:

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.18-alpine3.17 as builder
+FROM node:20.8.0-alpine3.17 as builder
 
 RUN apk --update add git build-base
 
@@ -16,7 +16,7 @@ COPY /src ./src/
 
 RUN npm run build
 
-FROM node:18.18-alpine3.17
+FROM node:20.8.0-alpine3.17
 
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.7.2/wait /wait
 RUN chmod +x /wait