From eb5a6af2f0abfb0dacc8ae10930004f22bcf6fe6 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 19 Aug 2017 22:40:21 -0400
Subject: [PATCH] move docker dir

---
 docker/docker-compose.linux.yml | 24 ++++++++++++------------
 docker/docker-compose.mac.yml   | 22 +++++++++++-----------
 scripts/bitwarden.sh            |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/docker/docker-compose.linux.yml b/docker/docker-compose.linux.yml
index 3505828e67..5120a49e2a 100644
--- a/docker/docker-compose.linux.yml
+++ b/docker/docker-compose.linux.yml
@@ -3,31 +3,31 @@ version: '3'
 services:
   mssql:
     volumes:
-      - ../../mssql_data:/var/opt/mssql/data
+      - ../mssql_data:/var/opt/mssql/data
     env_file:
       - mssql.env
-      - ../../env/mssql.override.env
+      - ../env/mssql.override.env
   web:
     volumes:
-      - ../../web:/etc/bitwarden/web
+      - ../web:/etc/bitwarden/web
   attachments:
     volumes:
-      - ../../core/attachments:/etc/bitwarden/core/attachments
+      - ../core/attachments:/etc/bitwarden/core/attachments
   api:
     volumes:
-      - ../../core:/etc/bitwarden/core
+      - ../core:/etc/bitwarden/core
     env_file:
       - global.env
-      - ../../env/global.override.env
+      - ../env/global.override.env
   identity:
     volumes:
-      - ../../identity:/etc/bitwarden/identity
-      - ../../core:/etc/bitwarden/core
+      - ../identity:/etc/bitwarden/identity
+      - ../core:/etc/bitwarden/core
     env_file:
       - global.env
-      - ../../env/global.override.env
+      - ../env/global.override.env
   nginx:
     volumes:
-      - ../../nginx:/etc/bitwarden/nginx
-      - ../../letsencrypt:/etc/letsencrypt
-      - ../../ssl:/etc/ssl
+      - ../nginx:/etc/bitwarden/nginx
+      - ../letsencrypt:/etc/letsencrypt
+      - ../ssl:/etc/ssl
diff --git a/docker/docker-compose.mac.yml b/docker/docker-compose.mac.yml
index 8b9097f23e..1b761cb35e 100644
--- a/docker/docker-compose.mac.yml
+++ b/docker/docker-compose.mac.yml
@@ -6,30 +6,30 @@ services:
       - mssql_data:/var/opt/mssql/data
     env_file:
       - mssql.env
-      - ../../env/mssql.override.env
+      - ../env/mssql.override.env
   web:
     volumes:
-      - ../../web:/etc/bitwarden/web
+      - ../web:/etc/bitwarden/web
   attachments:
     volumes:
-      - ../../core/attachments:/etc/bitwarden/core/attachments
+      - ../core/attachments:/etc/bitwarden/core/attachments
   api:
     volumes:
-      - ../../core:/etc/bitwarden/core
+      - ../core:/etc/bitwarden/core
     env_file:
       - global.env
-      - ../../env/global.override.env
+      - ../env/global.override.env
   identity:
     volumes:
-      - ../../identity:/etc/bitwarden/identity
-      - ../../core:/etc/bitwarden/core
+      - ../identity:/etc/bitwarden/identity
+      - ../core:/etc/bitwarden/core
     env_file:
       - global.env
-      - ../../env/global.override.env
+      - ../env/global.override.env
   nginx:
     volumes:
-      - ../../nginx:/etc/bitwarden/nginx
-      - ../../letsencrypt:/etc/letsencrypt
-      - ../../ssl:/etc/ssl
+      - ../nginx:/etc/bitwarden/nginx
+      - ../letsencrypt:/etc/letsencrypt
+      - ../ssl:/etc/ssl
 volumes:
   mssql_data:
diff --git a/scripts/bitwarden.sh b/scripts/bitwarden.sh
index eb965ead5e..9f446e6940 100755
--- a/scripts/bitwarden.sh
+++ b/scripts/bitwarden.sh
@@ -39,7 +39,7 @@ then
 fi
 
 SCRIPTS_DIR="$OUTPUT/scripts"
-DOCKER_DIR="$SCRIPTS_DIR/docker"
+DOCKER_DIR="$OUTPUT/docker"
 GITHUB_BASE_URL="https://raw.githubusercontent.com/bitwarden/core/master"
 
 if [ ! -d "$SCRIPTS_DIR" ]