diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 25a33f1..d68246b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -44,6 +44,6 @@ jobs: script: | docker login --username ${{ secrets.DOCKER_ID }} --password ${{ secrets.DOCKER_PASSWORD }} docker pull traveline/traveline-docker - docker stop traveline-repo || true - docker rm traveline-repo || true - docker run -e DB_HOST=${{ secrets.DB_HOST }} -e DB_PORT=${{ secrets.DB_PORT }} -e DB_USER=${{ secrets.DB_USER }} -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} -e DB_DATABASE=${{ secrets.DB_DATABASE }} -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} -e AWS_REGION=${{ secrets.AWS_REGION }} -d -p 4817:3000 --name traveline-repo traveline/traveline-docker + docker stop traveline-container || true + docker rm traveline-container || true + docker run -e DB_HOST=${{ secrets.DB_HOST }} -e DB_PORT=${{ secrets.DB_PORT }} -e DB_USER=${{ secrets.DB_USER }} -e DB_PASSWORD=${{ secrets.DB_PASSWORD }} -e DB_DATABASE=${{ secrets.DB_DATABASE }} -e AWS_ACCESS_KEY_ID=${{ secrets.AWS_ACCESS_KEY_ID }} -e AWS_SECRET_ACCESS_KEY=${{ secrets.AWS_SECRET_ACCESS_KEY }} -e AWS_REGION=${{ secrets.AWS_REGION }} -d -p 1748:3000 --name traveline-container traveline/traveline-docker diff --git a/BE/package-lock.json b/BE/package-lock.json index 155bbb9..d95d7ae 100644 --- a/BE/package-lock.json +++ b/BE/package-lock.json @@ -15,7 +15,7 @@ "@nestjs/platform-express": "^10.0.0", "@nestjs/swagger": "^7.1.15", "@nestjs/typeorm": "^10.0.0", - "aws-sdk": "^2.1499.0", + "aws-sdk": "^2.1500.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "mysql2": "^3.6.3", @@ -23,6 +23,7 @@ "reflect-metadata": "^0.1.13", "rxjs": "^7.8.1", "typeorm": "^0.3.17", + "uuid": "^9.0.1", "winston": "^3.11.0", "winston-daily-rotate-file": "^4.7.1" }, @@ -1656,6 +1657,14 @@ "reflect-metadata": "^0.1.13" } }, + "node_modules/@nestjs/config/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@nestjs/core": { "version": "10.2.8", "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.2.8.tgz", @@ -1821,6 +1830,14 @@ "typeorm": "^0.3.0" } }, + "node_modules/@nestjs/typeorm/node_modules/uuid": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", + "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -2826,9 +2843,9 @@ } }, "node_modules/aws-sdk": { - "version": "2.1499.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1499.0.tgz", - "integrity": "sha512-kh89lcXx7lP83uVjzRPkOueRoM8gQlep86W9+l3qCTHSLiVJuc0MiPmqCLMPlOAZil+35roFkwWIP2FJ1WcdXg==", + "version": "2.1500.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1500.0.tgz", + "integrity": "sha512-e6ISdnxgHbq+QWYYILdSMfTuTJgLSR9PLKEz4RCxaybKIe05z75jYgc2WSPt9++3rQPSdqSc4wYSlwuE0m7jjA==", "dependencies": { "buffer": "4.9.2", "events": "1.1.1", @@ -9428,9 +9445,13 @@ } }, "node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } diff --git a/BE/package.json b/BE/package.json index b21aba1..6f885a0 100644 --- a/BE/package.json +++ b/BE/package.json @@ -26,7 +26,7 @@ "@nestjs/platform-express": "^10.0.0", "@nestjs/swagger": "^7.1.15", "@nestjs/typeorm": "^10.0.0", - "aws-sdk": "^2.1499.0", + "aws-sdk": "^2.1500.0", "class-transformer": "^0.5.1", "class-validator": "^0.14.0", "mysql2": "^3.6.3", @@ -34,6 +34,7 @@ "reflect-metadata": "^0.1.13", "rxjs": "^7.8.1", "typeorm": "^0.3.17", + "uuid": "^9.0.1", "winston": "^3.11.0", "winston-daily-rotate-file": "^4.7.1" },