From 7635f757e08dea4d026d6268e54b2a24459fdb8b Mon Sep 17 00:00:00 2001 From: lora322 <39804183+lora322@users.noreply.github.com> Date: Sat, 30 Aug 2025 19:39:10 +0000 Subject: [PATCH] Describe your changes --- backend/yarn.lock | 12 ++++++++++++ docker/docker-compose.yml | 33 ++++++++++++--------------------- docker/start-backend.sh | 0 docker/wait-for-it.sh | 0 package-lock.json | 12 ++++++++++++ yarn.lock | 4 ++++ 6 files changed, 40 insertions(+), 21 deletions(-) mode change 100644 => 100755 docker/start-backend.sh mode change 100644 => 100755 docker/wait-for-it.sh create mode 100644 package-lock.json create mode 100644 yarn.lock diff --git a/backend/yarn.lock b/backend/yarn.lock index 222a4f9..d130796 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -766,6 +766,13 @@ chokidar@^3.2.2: optionalDependencies: fsevents "~2.3.2" +chokidar@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30" + integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA== + dependencies: + readdirp "^4.0.1" + chownr@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" @@ -3395,6 +3402,11 @@ readable-stream@^4.2.0: process "^0.11.10" string_decoder "^1.3.0" +readdirp@^4.0.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.1.2.tgz#eb85801435fbf2a7ee58f19e0921b068fc69948d" + integrity sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg== + readdirp@~3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index fc73516..1fef97b 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -15,11 +15,6 @@ services: max-size: "10m" max-file: "3" db: - logging: - driver: json-file - options: - max-size: "10m" - max-file: "3" image: postgres volumes: - ./data/db:/var/lib/postgresql/data @@ -33,24 +28,20 @@ services: options: max-size: "10m" max-file: "3" - backend: - image: backend - volumes: - - ./wait-for-it.sh:/usr/src/app/wait-for-it.sh - - ./start-backend.sh:/usr/src/app/start-backend.sh build: ../backend + volumes: + - ./wait-for-it.sh:/usr/src/app/wait-for-it.sh + - ./start-backend.sh:/usr/src/app/start-backend.sh environment: - - DB_HOST=db + - DB_HOST=db ports: - - "8080:8080" - logging: - driver: json-file - options: - max-size: "10m" - max-file: "3" + - "8080:8080" + logging: + driver: json-file + options: + max-size: "10m" + max-file: "3" depends_on: - - "db" - - command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start-backend.sh"] - + - db + command: ["bash", "./wait-for-it.sh", "db:5432", "--timeout=0", "--strict", "--", "bash", "./start- \ No newline at end of file diff --git a/docker/start-backend.sh b/docker/start-backend.sh old mode 100644 new mode 100755 diff --git a/docker/wait-for-it.sh b/docker/wait-for-it.sh old mode 100644 new mode 100755 diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..bc77efb --- /dev/null +++ b/package-lock.json @@ -0,0 +1,12 @@ +{ + "name": "app", + "version": "0.0.0", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "name": "app", + "version": "0.0.0" + } + } +} diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..fb57ccd --- /dev/null +++ b/yarn.lock @@ -0,0 +1,4 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + +