From 2a519d9b15cb71f02a55b0bfa60881dcb0b9e6a5 Mon Sep 17 00:00:00 2001 From: dragongoose Date: Mon, 12 Feb 2024 22:11:13 -0500 Subject: [PATCH] Move docker components --- backend-nginx.conf => configs/backend-nginx.conf | 0 frontend-nginx.conf => configs/frontend-nginx.conf | 0 .dockerignore => docker/.dockerignore | 0 Dockerfile => docker/Dockerfile | 2 +- docker-compose.yml => docker/docker-compose.yml | 0 nginx.conf => docker/nginx.conf | 0 .../substitute_environment_variables.sh | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename backend-nginx.conf => configs/backend-nginx.conf (100%) rename frontend-nginx.conf => configs/frontend-nginx.conf (100%) rename .dockerignore => docker/.dockerignore (100%) rename Dockerfile => docker/Dockerfile (99%) rename docker-compose.yml => docker/docker-compose.yml (100%) rename nginx.conf => docker/nginx.conf (100%) rename substitute_environment_variables.sh => docker/substitute_environment_variables.sh (100%) diff --git a/backend-nginx.conf b/configs/backend-nginx.conf similarity index 100% rename from backend-nginx.conf rename to configs/backend-nginx.conf diff --git a/frontend-nginx.conf b/configs/frontend-nginx.conf similarity index 100% rename from frontend-nginx.conf rename to configs/frontend-nginx.conf diff --git a/.dockerignore b/docker/.dockerignore similarity index 100% rename from .dockerignore rename to docker/.dockerignore diff --git a/Dockerfile b/docker/Dockerfile similarity index 99% rename from Dockerfile rename to docker/Dockerfile index ccf3c76..1060ff0 100644 --- a/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,7 @@ ENV SAFETWITCH_DEFAULT_LOCALE SAFETWITCH_DEFAULT_LOCALE_PLACEHOLDER ENV SAFETWITCH_FALLBACK_LOCALE SAFETWITCH_FALLBACK_LOCALE_PLACEHOLDER ENV SAFETWITCH_DEFAULT_THEME SAFETWITCH_DEFAULT_THEME_PLACEHOLDER # Copy all files from current directory to working dir in image -COPY . . +COPY ../ . # install node modules and build assets RUN npm i && npm run build diff --git a/docker-compose.yml b/docker/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to docker/docker-compose.yml diff --git a/nginx.conf b/docker/nginx.conf similarity index 100% rename from nginx.conf rename to docker/nginx.conf diff --git a/substitute_environment_variables.sh b/docker/substitute_environment_variables.sh similarity index 100% rename from substitute_environment_variables.sh rename to docker/substitute_environment_variables.sh