From e081213615fc9ecbfa2649110264925db1ef3bc5 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 8 Aug 2017 17:50:40 -0400
Subject: [PATCH] attachments build cleanup

---
 attachments/.dockerignore                               | 2 ++
 build.ps1                                               | 1 +
 build.sh                                                | 1 +
 nginx/.dockerignore                                     | 3 +++
 src/Core/Models/Api/Response/AttachmentResponseModel.cs | 2 +-
 util/Setup/.dockerignore                                | 3 +++
 6 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 attachments/.dockerignore
 create mode 100644 nginx/.dockerignore
 create mode 100644 util/Setup/.dockerignore

diff --git a/attachments/.dockerignore b/attachments/.dockerignore
new file mode 100644
index 0000000000..864179fda5
--- /dev/null
+++ b/attachments/.dockerignore
@@ -0,0 +1,2 @@
+*
+!entrypoint.sh
diff --git a/build.ps1 b/build.ps1
index fa14d01cd1..3fdefcabcd 100644
--- a/build.ps1
+++ b/build.ps1
@@ -7,4 +7,5 @@ echo "=================="
 & $dir\src\Api\build.ps1
 & $dir\src\Identity\build.ps1
 & $dir\nginx\build.ps1
+& $dir\attachments\build.ps1
 & $dir\util\Setup\build.ps1
diff --git a/build.sh b/build.sh
index 168e955b8e..1a4c5bc447 100644
--- a/build.sh
+++ b/build.sh
@@ -9,4 +9,5 @@ echo -e "=================="
 $DIR/src/Api/build.sh
 $DIR/src/Identity/build.sh
 $DIR/nginx/build.sh
+$DIR/attachments/build.sh
 $DIR/util/Setup/build.sh
diff --git a/nginx/.dockerignore b/nginx/.dockerignore
new file mode 100644
index 0000000000..ecb4c57f7c
--- /dev/null
+++ b/nginx/.dockerignore
@@ -0,0 +1,3 @@
+*
+!entrypoint.sh
+!nginx.conf
diff --git a/src/Core/Models/Api/Response/AttachmentResponseModel.cs b/src/Core/Models/Api/Response/AttachmentResponseModel.cs
index b3b74b734b..3c9abb9cb8 100644
--- a/src/Core/Models/Api/Response/AttachmentResponseModel.cs
+++ b/src/Core/Models/Api/Response/AttachmentResponseModel.cs
@@ -12,7 +12,7 @@ namespace Bit.Core.Models.Api
             : base("attachment")
         {
             Id = id;
-            Url = $"{globalSettings.Attachment.BaseUrl}{cipher.Id}/{id}";
+            Url = $"{globalSettings.Attachment.BaseUrl}/{cipher.Id}/{id}";
             FileName = data.FileName;
             Size = data.SizeString;
             SizeName = Utilities.CoreHelpers.ReadableBytesSize(data.Size);
diff --git a/util/Setup/.dockerignore b/util/Setup/.dockerignore
new file mode 100644
index 0000000000..d8f8175f6c
--- /dev/null
+++ b/util/Setup/.dockerignore
@@ -0,0 +1,3 @@
+*
+!obj/Docker/publish/*
+!obj/Docker/empty/