diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 020fb6e..d4d4205 100644 --- 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 index 3822f2e..06ae981 100644 --- 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 diff --git a/package-lock.json b/package-lock.json index eb46fe1..7765d9d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,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", @@ -31,7 +31,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": { @@ -3588,9 +3588,10 @@ } }, "node_modules/bree": { - "version": "9.2.3", - "resolved": "https://registry.npmjs.org/bree/-/bree-9.2.3.tgz", - "integrity": "sha512-iCVyLVcqql8rFogVX5gzkofdo6OZu8mxe5dUSkAZyaR43UdNfP0DOj3jJk31yogy6lfnRMhGvO5Gj1ypLeInuA==", + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/bree/-/bree-9.2.4.tgz", + "integrity": "sha512-3GDVYbRYxPIIKgqu00FlIDD//q/0XkMC+zq74sp/qRRQQUWdc39lsFkdHW2g2lTlhaxbqkHd97p8oRMm/YeSJw==", + "license": "MIT", "dependencies": { "@breejs/later": "^4.2.0", "boolean": "^3.2.0", @@ -10846,15 +10847,16 @@ } }, "node_modules/winston": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz", - "integrity": "sha512-rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==", + "version": "3.13.1", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz", + "integrity": "sha512-SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==", + "license": "MIT", "dependencies": { "@colors/colors": "^1.6.0", "@dabh/diagnostics": "^2.0.2", "async": "^3.2.3", "is-stream": "^2.0.0", - "logform": "^2.4.0", + "logform": "^2.6.0", "one-time": "^1.0.0", "readable-stream": "^3.4.0", "safe-stable-stringify": "^2.3.1", diff --git a/package.json b/package.json index b4498d5..09a921d 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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": {