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

fix: remove references to Rocket.toml (#42)

Browse Source 
It does not exist for 1.25.0, apparently it is no longer needed.
This commit is contained in:
ydylla
2022-06-02 22:51:36 +02:00
committed by GitHub
parent a209f48a12
commit 73ebe86441
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conffiles.dist
-1
View File
@@ -1,2 +1 @@
/etc/@@PACKAGEDIR@@/Rocket.toml
/etc/@@PACKAGEDIR@@/config.env /etc/@@PACKAGEDIR@@/config.env
patch/amd64/Dockerfile.patch
+1 -2
View File
@@ -1,6 +1,6 @@
--- 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,24 @@ @@ -111,3 +111,23 @@
WORKDIR / WORKDIR /
ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/start.sh"] CMD ["/start.sh"]
@@ -18,7 +18,6 @@
+COPY debian/control /vaultwarden_package/DEBIAN/control +COPY debian/control /vaultwarden_package/DEBIAN/control
+COPY debian/postinst /vaultwarden_package/DEBIAN/postinst +COPY debian/postinst /vaultwarden_package/DEBIAN/postinst
+COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles +COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles
+COPY Rocket.toml /vaultwarden_package/etc/@@PACKAGEDIR@@
+COPY debian/config.env /vaultwarden_package/etc/@@PACKAGEDIR@@ +COPY debian/config.env /vaultwarden_package/etc/@@PACKAGEDIR@@
+COPY debian/@@EXECUTABLENAME@@.service /vaultwarden_package/usr/lib/systemd/system +COPY debian/@@EXECUTABLENAME@@.service /vaultwarden_package/usr/lib/systemd/system
+COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault +COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault
patch/armv7/Dockerfile.patch
+1 -2
View File
@@ -1,6 +1,6 @@
--- 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,24 @@ @@ -157,3 +157,23 @@
WORKDIR / WORKDIR /
ENTRYPOINT ["/usr/bin/dumb-init", "--"] ENTRYPOINT ["/usr/bin/dumb-init", "--"]
CMD ["/start.sh"] CMD ["/start.sh"]
@@ -18,7 +18,6 @@
+COPY debian/control /vaultwarden_package/DEBIAN/control +COPY debian/control /vaultwarden_package/DEBIAN/control
+COPY debian/postinst /vaultwarden_package/DEBIAN/postinst +COPY debian/postinst /vaultwarden_package/DEBIAN/postinst
+COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles +COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles
+COPY Rocket.toml /vaultwarden_package/etc/@@PACKAGEDIR@@
+COPY debian/config.env /vaultwarden_package/etc/@@PACKAGEDIR@@ +COPY debian/config.env /vaultwarden_package/etc/@@PACKAGEDIR@@
+COPY debian/@@EXECUTABLENAME@@.service /vaultwarden_package/usr/lib/systemd/system +COPY debian/@@EXECUTABLENAME@@.service /vaultwarden_package/usr/lib/systemd/system
+COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault +COPY --from=vault /web-vault /vaultwarden_package/usr/share/@@PACKAGEDIR@@/web-vault
postinst.dist
-1
View File
@@ -2,4 +2,3 @@
DIR_MODE=0700 adduser --system --group --home /var/lib/@@PACKAGEDIR@@ @@SERVICEUSER@@ DIR_MODE=0700 adduser --system --group --home /var/lib/@@PACKAGEDIR@@ @@SERVICEUSER@@
chmod 700 /var/lib/@@PACKAGEDIR@@ chmod 700 /var/lib/@@PACKAGEDIR@@
chmod 600 /etc/@@PACKAGEDIR@@/config.env chmod 600 /etc/@@PACKAGEDIR@@/config.env
chmod 600 /etc/@@PACKAGEDIR@@/Rocket.toml