From b0c47f63d1f189c9837f9a023cad9d170756e7d7 Mon Sep 17 00:00:00 2001 From: ray Date: Tue, 10 Mar 2020 19:36:39 +0000 Subject: [PATCH] tidy up directory structure --- production/{ => docker}/Dockerfile | 0 production/{ => docker}/docker-compose.yml | 0 production/{ => docker}/entrypoint.sh | 0 production/export-to-production.sh | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename production/{ => docker}/Dockerfile (100%) rename production/{ => docker}/docker-compose.yml (100%) rename production/{ => docker}/entrypoint.sh (100%) diff --git a/production/Dockerfile b/production/docker/Dockerfile similarity index 100% rename from production/Dockerfile rename to production/docker/Dockerfile diff --git a/production/docker-compose.yml b/production/docker/docker-compose.yml similarity index 100% rename from production/docker-compose.yml rename to production/docker/docker-compose.yml diff --git a/production/entrypoint.sh b/production/docker/entrypoint.sh similarity index 100% rename from production/entrypoint.sh rename to production/docker/entrypoint.sh diff --git a/production/export-to-production.sh b/production/export-to-production.sh index 3e96793..cdfb1b7 100755 --- a/production/export-to-production.sh +++ b/production/export-to-production.sh @@ -16,10 +16,10 @@ $_ssh_cmd "mkdir -p $_docker_dir/wordpress" echo "Copying files ..." scp -r production/config "$_scp_to_base"/config -scp production/Dockerfile "$_scp_to_base"/Dockerfile -scp production/entrypoint.sh "$_scp_to_base"/entrypoint.sh +scp production/docker/Dockerfile "$_scp_to_base"/Dockerfile +scp production/docker/entrypoint.sh "$_scp_to_base"/entrypoint.sh scp .env "$_scp_to_base"/.env -scp production/docker-compose.yml "$_scp_to_base"/docker-compose.yml +scp production/docker/docker-compose.yml "$_scp_to_base"/docker-compose.yml scp wordpress.tar.gz "$_scp_to_base"/wordpress.tar.gz $_ssh_cmd "tar -xf $_docker_dir/wordpress.tar.gz -C $_docker_dir/wordpress && rm $_docker_dir/wordpress.tar.gz"