Skip to content

Commit

Permalink
Merge branch 'master' into feature/v5
Browse files Browse the repository at this point in the history
  • Loading branch information
ludeknovy authored Aug 30, 2024
2 parents deca7fe + 7e3f92b commit b7ab8a3
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 20 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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
Expand Down
20 changes: 11 additions & 9 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 @@ -23,7 +23,7 @@
"bcrypt": "^5.1.1",
"body-parser": "^1.20.1",
"boom": "^7.2.0",
"bree": "^9.2.3",
"bree": "^9.2.4",
"compression": "^1.7.4",
"dotenv": "^16.4.5",
"express": "^4.19.2",
Expand All @@ -40,7 +40,7 @@
"pg": "^8.12.0",
"pg-promise": "^10.15.4",
"uuid": "^9.0.1",
"winston": "^3.13.0",
"winston": "^3.13.1",
"xlsx": "https://cdn.sheetjs.com/xlsx-0.20.1/xlsx-0.20.1.tgz"
},
"devDependencies": {
Expand Down

0 comments on commit b7ab8a3

Please sign in to comment.