sko/vaultwarden-debian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

create package in its own directory

Browse Source 
fixes #37
This commit is contained in:
Greizgh
2021-10-11 18:47:59 +02:00
parent e5a3bb64a2
commit 394689b432
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.sh
+1 -1
View File
@@ -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" docker build -t vaultwarden-deb "$SRC" --build-arg DB="$DB_TYPE" --target dpkg -f "$DIR/Dockerfile"
CID=$(docker run -d vaultwarden-deb) 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" docker rm "$CID"
patch/amd64/Dockerfile.patch
+3 -2
View File
@@ -1,12 +1,13 @@
--- git/docker/amd64/Dockerfile 2021-02-12 11:45:13.762372371 +0100 --- git/docker/amd64/Dockerfile 2021-02-12 11:45:13.762372371 +0100
+++ Dockerfile 2021-02-12 11:59:56.727518522 +0100 +++ Dockerfile 2021-02-12 11:59:56.727518522 +0100
@@ -111,3 +111,23 @@ @@ -111,3 +111,24 @@
WORKDIR / WORKDIR /
ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/start.sh"] CMD ["/start.sh"]
+ +
+####################### dpkg target ########################## +####################### dpkg target ##########################
+FROM build as dpkg +FROM build as dpkg
+RUN mkdir /outdir
+RUN mkdir -p /vaultwarden_package/DEBIAN +RUN mkdir -p /vaultwarden_package/DEBIAN
+RUN mkdir -p /vaultwarden_package/usr/local/bin +RUN mkdir -p /vaultwarden_package/usr/local/bin
+RUN mkdir -p /vaultwarden_package/usr/lib/systemd/system +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=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault
+COPY --from=build app/target/release/vaultwarden /vaultwarden_package/usr/local/bin/@@EXECUTABLENAME@@ +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
patch/armv7/Dockerfile.patch
+3 -2
View File
@@ -1,12 +1,13 @@
--- git/docker/armv7/Dockerfile 2021-02-12 11:45:13.763372371 +0100 --- git/docker/armv7/Dockerfile 2021-02-12 11:45:13.763372371 +0100
+++ Dockerfile 2021-02-12 12:25:50.078877369 +0100 +++ Dockerfile 2021-02-12 12:25:50.078877369 +0100
@@ -157,3 +157,23 @@ @@ -157,3 +157,24 @@
WORKDIR / WORKDIR /
ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/start.sh"] CMD ["/start.sh"]
+ +
+####################### dpkg target ########################## +####################### dpkg target ##########################
+FROM build as dpkg +FROM build as dpkg
+RUN mkdir /outdir
+RUN mkdir -p /vaultwarden_package/DEBIAN +RUN mkdir -p /vaultwarden_package/DEBIAN
+RUN mkdir -p /vaultwarden_package/usr/local/bin +RUN mkdir -p /vaultwarden_package/usr/local/bin
+RUN mkdir -p /vaultwarden_package/usr/lib/systemd/system +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=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@@ +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