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

rename built package

Browse Source
This commit is contained in:
Greizgh
2021-05-04 19:19:53 +02:00
parent 16b9d95731
commit ffb4d2ab6e
9 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -2,5 +2,5 @@ git/
dist/ dist/
debian/config.env debian/config.env
debian/control debian/control
debian/bitwarden_rs.service debian/vaultwarden.service
Dockerfile Dockerfile
README.md
+3 -3
View File
@@ -17,10 +17,10 @@ Then:
``` ```
git clone https://github.com/greizgh/bitwarden_rs-debian.git git clone https://github.com/greizgh/bitwarden_rs-debian.git
cd bitwarden_rs-debian cd bitwarden_rs-debian
./build.sh -r <version> # target bitwarden_rs version, example 1.19.0 ./build.sh -r <version> # target vaultwarden version, example 1.19.0
``` ```
The `build.sh` script will build bitwarden_rs for the same Debian version which targets vaultwarden. The `build.sh` script will build vaultwarden for the same Debian version which targets vaultwarden.
That means, to build vaultwarden v1.19.0, make sure to checkout tag `v1.19.0` of this project. That means, to build vaultwarden v1.19.0, make sure to checkout tag `v1.19.0` of this project.
To compile for a different Debian version, specify the release name (e.g. Stretch, Buster) using the `-o` option. You can compile for arm32v7 or amd64 architecture using the `-a` option, only the Buster (default) release of debian is supported by arm32v7. To compile for a different Debian version, specify the release name (e.g. Stretch, Buster) using the `-o` option. You can compile for arm32v7 or amd64 architecture using the `-a` option, only the Buster (default) release of debian is supported by arm32v7.
@@ -33,7 +33,7 @@ To compile for a different Debian version, specify the release name (e.g. Stretc
The packaged systemd unit is **disabled**, you need to configure vaultwarden through its The packaged systemd unit is **disabled**, you need to configure vaultwarden through its
[EnvFile](https://www.freedesktop.org/software/systemd/man/systemd.service.html#Command%20lines): [EnvFile](https://www.freedesktop.org/software/systemd/man/systemd.service.html#Command%20lines):
`/etc/bitwarden_rs/config.env` `/etc/vaultwarden/config.env`
You will also probably want to setup a reverse proxy. You will also probably want to setup a reverse proxy.
build.sh
+8 -8
View File
@@ -27,7 +27,7 @@ if [ -z "$ARCH_DIR" ]; then ARCH_DIR="amd64"; fi
ARCH=$ARCH_DIR ARCH=$ARCH_DIR
if [[ "$ARCH" =~ ^arm ]]; then ARCH="armhf"; fi if [[ "$ARCH" =~ ^arm ]]; then ARCH="armhf"; fi
# Clone bitwarden_rs # Clone vaultwarden
if [ ! -d "$SRC" ]; then if [ ! -d "$SRC" ]; then
git clone https://github.com/dani-garcia/vaultwarden.git "$SRC" git clone https://github.com/dani-garcia/vaultwarden.git "$SRC"
fi fi
@@ -45,8 +45,8 @@ cd - || exit
# Prepare EnvFile # Prepare EnvFile
CONFIG="$DIR/debian/config.env" CONFIG="$DIR/debian/config.env"
cp "$SRC/.env.template" "$CONFIG" cp "$SRC/.env.template" "$CONFIG"
sed -i "s#\# DATA_FOLDER=data#DATA_FOLDER=/var/lib/bitwarden_rs#" "$CONFIG" sed -i "s#\# DATA_FOLDER=data#DATA_FOLDER=/var/lib/vaultwarden#" "$CONFIG"
sed -i "s#\# WEB_VAULT_FOLDER=web-vault/#WEB_VAULT_FOLDER=/usr/share/bitwarden_rs/web-vault/#" "$CONFIG" sed -i "s#\# WEB_VAULT_FOLDER=web-vault/#WEB_VAULT_FOLDER=/usr/share/vaultwarden/web-vault/#" "$CONFIG"
sed -i "s/Uncomment any of the following lines to change the defaults/Uncomment any of the following lines to change the defaults\n\n## Warning\n## The default systemd-unit does not allow any custom directories.\n## Be sure to check if the service has appropriate permissions before you set custom paths./g" "$CONFIG" sed -i "s/Uncomment any of the following lines to change the defaults/Uncomment any of the following lines to change the defaults\n\n## Warning\n## The default systemd-unit does not allow any custom directories.\n## Be sure to check if the service has appropriate permissions before you set custom paths./g" "$CONFIG"
mkdir -p "$DST" mkdir -p "$DST"
@@ -63,7 +63,7 @@ sed -i "s/Version:.*/Version: $REF-1/" "$CONTROL"
sed -i "s/Architecture:.*/Architecture: $ARCH/" "$CONTROL" sed -i "s/Architecture:.*/Architecture: $ARCH/" "$CONTROL"
# Prepare Systemd-unit # Prepare Systemd-unit
SYSTEMD_UNIT="$DIR/debian/bitwarden_rs.service" SYSTEMD_UNIT="$DIR/debian/vaultwarden.service"
cp "$DIR/service.dist" "$SYSTEMD_UNIT" cp "$DIR/service.dist" "$SYSTEMD_UNIT"
if [ "$DB_TYPE" = "mysql" ]; then if [ "$DB_TYPE" = "mysql" ]; then
sed -i "s/After=network.target/After=network.target mysqld.service\nRequires=mysqld.service/g" "$SYSTEMD_UNIT" sed -i "s/After=network.target/After=network.target mysqld.service\nRequires=mysqld.service/g" "$SYSTEMD_UNIT"
@@ -71,11 +71,11 @@ elif [ "$DB_TYPE" = "postgresql" ]; then
sed -i "s/After=network.target/After=network.target postgresql.service\nRequires=postgresql.service/g" "$SYSTEMD_UNIT" sed -i "s/After=network.target/After=network.target postgresql.service\nRequires=postgresql.service/g" "$SYSTEMD_UNIT"
fi fi
echo "[INFO] docker build -t bitwarden-deb "$DIR" --build-arg DB=$DB_TYPE" echo "[INFO] docker build -t vaultwarden-deb "$DIR" --build-arg DB=$DB_TYPE"
cp -r "$DIR/debian" "$SRC/debian" cp -r "$DIR/debian" "$SRC/debian"
docker build -t bitwarden-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"
pushd "$SRC"; git clean -fd; popd pushd "$SRC"; git clean -fd; popd
CID=$(docker run -d bitwarden-deb) CID=$(docker run -d vaultwarden-deb)
docker cp "$CID":/bitwarden_package/vaultwarden.deb "$DST/vaultwarden-${OS_VERSION_NAME}-${REF}-${DB_TYPE}-${ARCH_DIR}.deb" docker cp "$CID":/vaultwarden_package/vaultwarden.deb "$DST/vaultwarden-${OS_VERSION_NAME}-${REF}-${DB_TYPE}-${ARCH_DIR}.deb"
docker rm "$CID" docker rm "$CID"
control.dist
+1 -1
View File
@@ -1,4 +1,4 @@
Package: bitwarden-rs Package: vaultwarden
Architecture: - Architecture: -
Maintainer: Greizgh <greizgh+bitwardenrs@ephax.org> Maintainer: Greizgh <greizgh+bitwardenrs@ephax.org>
Priority: optional Priority: optional
debian/conffiles
Vendored
+2 -2
View File
@@ -1,2 +1,2 @@
/etc/bitwarden_rs/Rocket.toml /etc/vaultwarden/Rocket.toml
/etc/bitwarden_rs/config.env /etc/vaultwarden/config.env
debian/postinst
Vendored
+4 -4
View File
@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
DIR_MODE=0700 adduser --system --home /var/lib/bitwarden_rs bitwarden DIR_MODE=0700 adduser --system --home /var/lib/vaultwarden vaultwarden
chmod 700 /var/lib/bitwarden_rs chmod 700 /var/lib/vaultwarden
chmod 600 /etc/bitwarden_rs/config.env chmod 600 /etc/vaultwarden/config.env
chmod 600 /etc/bitwarden_rs/Rocket.toml chmod 600 /etc/vaultwarden/Rocket.toml
patch/amd64/Dockerfile.patch
+14 -14
View File
@@ -7,20 +7,20 @@
+ +
+####################### dpkg target ########################## +####################### dpkg target ##########################
+FROM build as dpkg +FROM build as dpkg
+RUN mkdir -p /bitwarden_package/DEBIAN +RUN mkdir -p /vaultwarden_package/DEBIAN
+RUN mkdir -p /bitwarden_package/usr/local/bin +RUN mkdir -p /vaultwarden_package/usr/local/bin
+RUN mkdir -p /bitwarden_package/usr/lib/systemd/system +RUN mkdir -p /vaultwarden_package/usr/lib/systemd/system
+RUN mkdir -p /bitwarden_package/etc/bitwarden_rs +RUN mkdir -p /vaultwarden_package/etc/vaultwarden
+RUN mkdir -p /bitwarden_package/usr/share/bitwarden_rs +RUN mkdir -p /vaultwarden_package/usr/share/vaultwarden
+ +
+WORKDIR /bitwarden_package +WORKDIR /vaultwarden_package
+COPY debian/control /bitwarden_package/DEBIAN/control +COPY debian/control /vaultwarden_package/DEBIAN/control
+COPY debian/postinst /bitwarden_package/DEBIAN/postinst +COPY debian/postinst /vaultwarden_package/DEBIAN/postinst
+COPY debian/conffiles /bitwarden_package/DEBIAN/conffiles +COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles
+COPY Rocket.toml /bitwarden_package/etc/bitwarden_rs +COPY Rocket.toml /vaultwarden_package/etc/vaultwarden
+COPY debian/config.env /bitwarden_package/etc/bitwarden_rs +COPY debian/config.env /vaultwarden_package/etc/vaultwarden
+COPY debian/bitwarden_rs.service /bitwarden_package/usr/lib/systemd/system +COPY debian/vaultwarden.service /vaultwarden_package/usr/lib/systemd/system
+COPY --from=vault /web-vault /bitwarden_package/usr/share/bitwarden_rs/web-vault +COPY --from=vault /web-vault /vaultwarden_package/usr/share/vaultwarden/web-vault
+COPY --from=build app/target/release/vaultwarden /bitwarden_package/usr/local/bin +COPY --from=build app/target/release/vaultwarden /vaultwarden_package/usr/local/bin
+ +
+RUN dpkg-deb --build . vaultwarden.deb +RUN dpkg-deb --build . vaultwarden.deb
patch/armv7/Dockerfile.patch
+14 -14
View File
@@ -7,20 +7,20 @@
+ +
+####################### dpkg target ########################## +####################### dpkg target ##########################
+FROM build as dpkg +FROM build as dpkg
+RUN mkdir -p /bitwarden_package/DEBIAN +RUN mkdir -p /vaultwarden_package/DEBIAN
+RUN mkdir -p /bitwarden_package/usr/local/bin +RUN mkdir -p /vaultwarden_package/usr/local/bin
+RUN mkdir -p /bitwarden_package/usr/lib/systemd/system +RUN mkdir -p /vaultwarden_package/usr/lib/systemd/system
+RUN mkdir -p /bitwarden_package/etc/bitwarden_rs +RUN mkdir -p /vaultwarden_package/etc/vaultwarden
+RUN mkdir -p /bitwarden_package/usr/share/bitwarden_rs +RUN mkdir -p /vaultwarden_package/usr/share/vaultwarden
+ +
+WORKDIR /bitwarden_package +WORKDIR /vaultwarden_package
+COPY debian/control /bitwarden_package/DEBIAN/control +COPY debian/control /vaultwarden_package/DEBIAN/control
+COPY debian/postinst /bitwarden_package/DEBIAN/postinst +COPY debian/postinst /vaultwarden_package/DEBIAN/postinst
+COPY debian/conffiles /bitwarden_package/DEBIAN/conffiles +COPY debian/conffiles /vaultwarden_package/DEBIAN/conffiles
+COPY Rocket.toml /bitwarden_package/etc/bitwarden_rs +COPY Rocket.toml /vaultwarden_package/etc/vaultwarden
+COPY debian/config.env /bitwarden_package/etc/bitwarden_rs +COPY debian/config.env /vaultwarden_package/etc/vaultwarden
+COPY debian/bitwarden_rs.service /bitwarden_package/usr/lib/systemd/system +COPY debian/vaultwarden.service /vaultwarden_package/usr/lib/systemd/system
+COPY --from=vault /web-vault /bitwarden_package/usr/share/bitwarden_rs/web-vault +COPY --from=vault /web-vault /vaultwarden_package/usr/share/vaultwarden/web-vault
+COPY --from=build app/target/armv7-unknown-linux-gnueabihf/release/vaultwarden /bitwarden_package/usr/local/bin +COPY --from=build app/target/armv7-unknown-linux-gnueabihf/release/vaultwarden /vaultwarden_package/usr/local/bin
+ +
+RUN dpkg-deb --build . vaultwarden.deb +RUN dpkg-deb --build . vaultwarden.deb
service.dist
+5 -5
View File
@@ -4,15 +4,15 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
User=bitwarden User=vaultwarden
ExecStart=/usr/local/bin/bitwarden_rs ExecStart=/usr/local/bin/vaultwarden
PrivateTmp=true PrivateTmp=true
PrivateDevices=true PrivateDevices=true
ProtectHome=true ProtectHome=true
ProtectSystem=strict ProtectSystem=strict
WorkingDirectory=/etc/bitwarden_rs WorkingDirectory=/etc/vaultwarden
ReadWriteDirectories=/var/lib/bitwarden_rs ReadWriteDirectories=/var/lib/vaultwarden
EnvironmentFile=/etc/bitwarden_rs/config.env EnvironmentFile=/etc/vaultwarden/config.env
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target