From 394689b432550abf90590a9cd923b9d639a96c9c Mon Sep 17 00:00:00 2001
From: Greizgh <greizgh@ephax.org>
Date: Mon, 11 Oct 2021 18:47:59 +0200
Subject: [PATCH] create package in its own directory

fixes #37
---
 build.sh                     | 2 +-
 patch/amd64/Dockerfile.patch | 5 +++--
 patch/armv7/Dockerfile.patch | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index 2ab665f..8840432 100755
--- a/build.sh
+++ b/build.sh
@@ -110,5 +110,5 @@ echo "[INFO] docker build -t vaultwarden-deb $DIR --build-arg DB=$DB_TYPE"
 docker build -t vaultwarden-deb "$SRC" --build-arg DB="$DB_TYPE" --target dpkg -f "$DIR/Dockerfile"
 
 CID=$(docker run -d vaultwarden-deb)
-docker cp "$CID:/vaultwarden_package/${PACKAGEDIR}.deb" "$DST/${PACKAGEDIR}-${OS_VERSION_NAME}-${REF}-${DB_TYPE}-${ARCH_DIR}.deb"
+docker cp "$CID:/outdir/${PACKAGEDIR}.deb" "$DST/${PACKAGEDIR}-${OS_VERSION_NAME}-${REF}-${DB_TYPE}-${ARCH_DIR}.deb"
 docker rm "$CID"
diff --git a/patch/amd64/Dockerfile.patch b/patch/amd64/Dockerfile.patch
index d47a616..f50ac16 100644
--- a/patch/amd64/Dockerfile.patch
+++ b/patch/amd64/Dockerfile.patch
@@ -1,12 +1,13 @@
 --- git/docker/amd64/Dockerfile	2021-02-12 11:45:13.762372371 +0100
 +++ Dockerfile	2021-02-12 11:59:56.727518522 +0100
-@@ -111,3 +111,23 @@
+@@ -111,3 +111,24 @@
  WORKDIR /
  ENTRYPOINT ["/usr/bin/dumb-init", "--"]
  CMD ["/start.sh"]
 +
 +####################### dpkg target ##########################
 +FROM build as dpkg
++RUN mkdir /outdir
 +RUN mkdir -p /vaultwarden_package/DEBIAN
 +RUN mkdir -p /vaultwarden_package/usr/local/bin
 +RUN mkdir -p /vaultwarden_package/usr/lib/systemd/system
@@ -23,4 +24,4 @@
 +COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault
 +COPY --from=build app/target/release/vaultwarden /vaultwarden_package/usr/local/bin/@@EXECUTABLENAME@@
 +
-+RUN dpkg-deb --build . @@PACKAGEDIR@@.deb
++RUN dpkg-deb --build . /outdir/@@PACKAGEDIR@@.deb
diff --git a/patch/armv7/Dockerfile.patch b/patch/armv7/Dockerfile.patch
index 959a348..0c69238 100644
--- a/patch/armv7/Dockerfile.patch
+++ b/patch/armv7/Dockerfile.patch
@@ -1,12 +1,13 @@
 --- git/docker/armv7/Dockerfile	2021-02-12 11:45:13.763372371 +0100
 +++ Dockerfile	2021-02-12 12:25:50.078877369 +0100
-@@ -157,3 +157,23 @@
+@@ -157,3 +157,24 @@
  WORKDIR /
  ENTRYPOINT ["/usr/bin/dumb-init", "--"]
  CMD ["/start.sh"]
 +
 +####################### dpkg target ##########################
 +FROM build as dpkg
++RUN mkdir /outdir
 +RUN mkdir -p /vaultwarden_package/DEBIAN
 +RUN mkdir -p /vaultwarden_package/usr/local/bin
 +RUN mkdir -p /vaultwarden_package/usr/lib/systemd/system
@@ -23,4 +24,4 @@
 +COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault
 +COPY --from=build app/target/armv7-unknown-linux-gnueabihf/release/vaultwarden /vaultwarden_package/usr/local/bin/@@EXECUTABLENAME@@
 +
-+RUN dpkg-deb --build . @@PACKAGEDIR@@.deb
++RUN dpkg-deb --build . /outdir/@@PACKAGEDIR@@.deb