From 6c30a9f4cb028bd13679ed305d1b8ed2b82b78f0 Mon Sep 17 00:00:00 2001 From: aliofye Date: Fri, 17 Jan 2025 19:18:07 -0500 Subject: [PATCH] Renamed docker folder --- docker-compose.yml | 6 +++--- {.docker => docker}/Dockerfile.dev | 4 ++-- {.docker => docker}/Dockerfile.prod | 6 +++--- {.docker => docker}/caddy/Caddyfile | 0 {.docker => docker}/scripts/dev-entrypoint.sh | 0 {.docker => docker}/scripts/prod-entrypoint.sh | 0 {.docker => docker}/scripts/wait-for-it.sh | 0 7 files changed, 8 insertions(+), 8 deletions(-) rename {.docker => docker}/Dockerfile.dev (82%) rename {.docker => docker}/Dockerfile.prod (87%) rename {.docker => docker}/caddy/Caddyfile (100%) rename {.docker => docker}/scripts/dev-entrypoint.sh (100%) rename {.docker => docker}/scripts/prod-entrypoint.sh (100%) rename {.docker => docker}/scripts/wait-for-it.sh (100%) diff --git a/docker-compose.yml b/docker-compose.yml index 304ce04..f79c20e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -27,7 +27,7 @@ services: dev: build: context: . - dockerfile: .docker/Dockerfile.dev + dockerfile: docker/Dockerfile.dev develop: watch: - action: sync @@ -57,13 +57,13 @@ services: prod: build: context: . - dockerfile: .docker/Dockerfile.prod + dockerfile: docker/Dockerfile.prod args: PUBLIC_WEB_API_URL: http://localhost:5173/api develop: watch: - action: sync+restart - path: .docker/caddy/Caddyfile + path: docker/caddy/Caddyfile target: /etc/caddy/Caddyfile - action: sync+restart path: ./packages/api diff --git a/.docker/Dockerfile.dev b/docker/Dockerfile.dev similarity index 82% rename from .docker/Dockerfile.dev rename to docker/Dockerfile.dev index ec56d6e..0df895e 100644 --- a/.docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -18,8 +18,8 @@ RUN bun install RUN bun run build # Copy entrypoint script and set permissions -COPY .docker/scripts/wait-for-it.sh /app/scripts/wait-for-it.sh -COPY .docker/scripts/dev-entrypoint.sh /app/scripts/dev-entrypoint.sh +COPY docker/scripts/wait-for-it.sh /app/scripts/wait-for-it.sh +COPY docker/scripts/dev-entrypoint.sh /app/scripts/dev-entrypoint.sh RUN chmod +x /app/scripts/wait-for-it.sh RUN chmod +x /app/scripts/dev-entrypoint.sh diff --git a/.docker/Dockerfile.prod b/docker/Dockerfile.prod similarity index 87% rename from .docker/Dockerfile.prod rename to docker/Dockerfile.prod index 5bc50c1..619cbca 100644 --- a/.docker/Dockerfile.prod +++ b/docker/Dockerfile.prod @@ -28,11 +28,11 @@ RUN curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | t RUN apt-get update && apt-get install -y caddy # Copy the Caddyfile into the container and format it -COPY .docker/caddy/Caddyfile /etc/caddy/Caddyfile +COPY docker/caddy/Caddyfile /etc/caddy/Caddyfile # Copy entrypoint script and set permissions -COPY .docker/scripts/wait-for-it.sh /app/scripts/wait-for-it.sh -COPY .docker/scripts/prod-entrypoint.sh /app/scripts/prod-entrypoint.sh +COPY docker/scripts/wait-for-it.sh /app/scripts/wait-for-it.sh +COPY docker/scripts/prod-entrypoint.sh /app/scripts/prod-entrypoint.sh RUN chmod +x /app/scripts/wait-for-it.sh RUN chmod +x /app/scripts/prod-entrypoint.sh diff --git a/.docker/caddy/Caddyfile b/docker/caddy/Caddyfile similarity index 100% rename from .docker/caddy/Caddyfile rename to docker/caddy/Caddyfile diff --git a/.docker/scripts/dev-entrypoint.sh b/docker/scripts/dev-entrypoint.sh similarity index 100% rename from .docker/scripts/dev-entrypoint.sh rename to docker/scripts/dev-entrypoint.sh diff --git a/.docker/scripts/prod-entrypoint.sh b/docker/scripts/prod-entrypoint.sh similarity index 100% rename from .docker/scripts/prod-entrypoint.sh rename to docker/scripts/prod-entrypoint.sh diff --git a/.docker/scripts/wait-for-it.sh b/docker/scripts/wait-for-it.sh similarity index 100% rename from .docker/scripts/wait-for-it.sh rename to docker/scripts/wait-for-it.sh