From 38a54f90056443ca6c99826ab91e4fec4f5debe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Don=C3=A1t?= Date: Tue, 20 May 2025 23:48:52 +0200 Subject: [PATCH 1/2] [#49] Dockerhttps://project.mdnd-it.cc/work_packages/49 From 87c790aa050d2c731900a6c3f28070b001602668 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Don=C3=A1t?= Date: Tue, 20 May 2025 23:49:50 +0200 Subject: [PATCH 2/2] [#49] Dockerhttps://project.mdnd-it.cc/work_packages/49 --- .env => SerpentRace_Docker/.env | 0 Dockerfile => SerpentRace_Docker/Dockerfile | 0 .../compose.yaml | 16 +++++++------- .../init-multi-db.sh | 0 SerpentRace_Docker/reset.bat | 2 ++ SerpentRace_Frontend/README.Docker.md | 22 ------------------- run.bat | 4 +++- stop.bat | 4 +++- 8 files changed, 16 insertions(+), 32 deletions(-) rename .env => SerpentRace_Docker/.env (100%) rename Dockerfile => SerpentRace_Docker/Dockerfile (100%) rename compose.yaml => SerpentRace_Docker/compose.yaml (85%) rename init-multi-db.sh => SerpentRace_Docker/init-multi-db.sh (100%) create mode 100644 SerpentRace_Docker/reset.bat delete mode 100644 SerpentRace_Frontend/README.Docker.md diff --git a/.env b/SerpentRace_Docker/.env similarity index 100% rename from .env rename to SerpentRace_Docker/.env diff --git a/Dockerfile b/SerpentRace_Docker/Dockerfile similarity index 100% rename from Dockerfile rename to SerpentRace_Docker/Dockerfile diff --git a/compose.yaml b/SerpentRace_Docker/compose.yaml similarity index 85% rename from compose.yaml rename to SerpentRace_Docker/compose.yaml index 71f58ea1..b021b2f5 100644 --- a/compose.yaml +++ b/SerpentRace_Docker/compose.yaml @@ -9,8 +9,8 @@ services: backend: build: - context: . - dockerfile: Dockerfile + context: .. + dockerfile: SerpentRace_Docker/Dockerfile target: prod environment: POSTGRES_HOST: db @@ -23,10 +23,10 @@ services: command: ["npx", "nodemon", "src/index.mjs"] develop: watch: - - path: ./SerpentRace_Backend/src + - path: ../SerpentRace_Backend/src action: sync target: /usr/local/app/backend/src - - path: ./SerpentRace_Backend/package.json + - path: ../SerpentRace_Backend/package.json action: rebuild labels: traefik.http.routers.backend.rule: Host(`localhost`) && PathPrefix(`/api`) @@ -36,17 +36,17 @@ services: frontend: build: - context: . - dockerfile: Dockerfile + context: .. + dockerfile: SerpentRace_Docker/Dockerfile target: client-build command: ["npm", "run", "dev", "--", "--host", "0.0.0.0", "--port", "5173"] working_dir: /usr/local/app/frontend develop: watch: - - path: ./SerpentRace_Frontend/src + - path: ../SerpentRace_Frontend/src action: sync target: /usr/local/app/frontend/src - - path: ./SerpentRace_Frontend/package.json + - path: ../SerpentRace_Frontend/package.json action: rebuild labels: traefik.http.routers.frontend.rule: Host(`localhost`) diff --git a/init-multi-db.sh b/SerpentRace_Docker/init-multi-db.sh similarity index 100% rename from init-multi-db.sh rename to SerpentRace_Docker/init-multi-db.sh diff --git a/SerpentRace_Docker/reset.bat b/SerpentRace_Docker/reset.bat new file mode 100644 index 00000000..83e6af6b --- /dev/null +++ b/SerpentRace_Docker/reset.bat @@ -0,0 +1,2 @@ +docker compose down -v +pause \ No newline at end of file diff --git a/SerpentRace_Frontend/README.Docker.md b/SerpentRace_Frontend/README.Docker.md deleted file mode 100644 index 8300f21d..00000000 --- a/SerpentRace_Frontend/README.Docker.md +++ /dev/null @@ -1,22 +0,0 @@ -### Building and running your application - -When you're ready, start your application by running: -`docker compose up --build`. - -Your application will be available at http://localhost:5173. - -### Deploying your application to the cloud - -First, build your image, e.g.: `docker build -t myapp .`. -If your cloud uses a different CPU architecture than your development -machine (e.g., you are on a Mac M1 and your cloud provider is amd64), -you'll want to build the image for that platform, e.g.: -`docker build --platform=linux/amd64 -t myapp .`. - -Then, push it to your registry, e.g. `docker push myregistry.com/myapp`. - -Consult Docker's [getting started](https://docs.docker.com/go/get-started-sharing/) -docs for more detail on building and pushing. - -### References -* [Docker's Node.js guide](https://docs.docker.com/language/nodejs/) \ No newline at end of file diff --git a/run.bat b/run.bat index f9400ff2..33be61ba 100644 --- a/run.bat +++ b/run.bat @@ -1 +1,3 @@ -docker compose watch \ No newline at end of file +cd ./SerpentRace_Docker +docker compose watch +pause \ No newline at end of file diff --git a/stop.bat b/stop.bat index 345e7ea1..b0fd1f29 100644 --- a/stop.bat +++ b/stop.bat @@ -1 +1,3 @@ -docker compose stop \ No newline at end of file +cd ./SerpentRace_Docker +docker compose stop +pause \ No newline at end of file