bump v1.19.0

Rework the dockerfile to build dpkg in a dedicated stage.
This simplifies the diff and hopefully reduce maintenance cost for
future versions.
This commit is contained in:
Greizgh
2021-02-12 12:15:19 +01:00
parent 069766d714
commit 0a9bf0bf57
4 changed files with 41 additions and 153 deletions

View File

@@ -0,0 +1,26 @@
--- 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 @@
WORKDIR /
ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/start.sh"]
+
+####################### dpkg target ##########################
+FROM build as dpkg
+RUN mkdir -p /bitwarden_package/DEBIAN
+RUN mkdir -p /bitwarden_package/usr/local/bin
+RUN mkdir -p /bitwarden_package/usr/lib/systemd/system
+RUN mkdir -p /bitwarden_package/etc/bitwarden_rs
+RUN mkdir -p /bitwarden_package/usr/share/bitwarden_rs
+
+WORKDIR /bitwarden_package
+COPY debian/control /bitwarden_package/DEBIAN/control
+COPY debian/postinst /bitwarden_package/DEBIAN/postinst
+COPY debian/conffiles /bitwarden_package/DEBIAN/conffiles
+COPY Rocket.toml /bitwarden_package/etc/bitwarden_rs
+COPY debian/config.env /bitwarden_package/etc/bitwarden_rs
+COPY debian/bitwarden_rs.service /bitwarden_package/usr/lib/systemd/system
+COPY --from=vault /web-vault /bitwarden_package/usr/share/bitwarden_rs/web-vault
+COPY --from=build app/target/armv7-unknown-linux-gnueabihf/release/bitwarden_rs /bitwarden_package/usr/local/bin
+
+RUN dpkg-deb --build . bitwarden-rs.deb