80 lines
2.4 KiB
Diff
80 lines
2.4 KiB
Diff
--- git/docker/amd64/Dockerfile 2020-12-29 21:18:53.687097820 +0100
|
|
+++ Dockerfile 2020-12-29 21:50:52.627961467 +0100
|
|
@@ -41,9 +41,9 @@
|
|
WORKDIR /app
|
|
|
|
# Copies over *only* your manifests and build files
|
|
-COPY ./Cargo.* ./
|
|
-COPY ./rust-toolchain ./rust-toolchain
|
|
-COPY ./build.rs ./build.rs
|
|
+COPY git/Cargo.* ./
|
|
+COPY git/rust-toolchain ./rust-toolchain
|
|
+COPY git/build.rs ./build.rs
|
|
|
|
|
|
# Builds your dependencies and removes the
|
|
@@ -54,7 +54,7 @@
|
|
|
|
# Copies the complete project
|
|
# To avoid copying unneeded files, use .dockerignore
|
|
-COPY . .
|
|
+COPY git .
|
|
|
|
# Make sure that we actually build the project
|
|
RUN touch src/main.rs
|
|
@@ -68,38 +68,22 @@
|
|
# because we already have a binary built
|
|
FROM debian:buster-slim
|
|
|
|
-ENV ROCKET_ENV "staging"
|
|
-ENV ROCKET_PORT=80
|
|
-ENV ROCKET_WORKERS=10
|
|
-
|
|
-# Install needed libraries
|
|
-RUN apt-get update && apt-get install -y \
|
|
- --no-install-recommends \
|
|
- openssl \
|
|
- ca-certificates \
|
|
- curl \
|
|
- sqlite3 \
|
|
- libmariadb-dev-compat \
|
|
- libpq5 \
|
|
- && rm -rf /var/lib/apt/lists/*
|
|
-
|
|
-RUN mkdir /data
|
|
-VOLUME /data
|
|
-EXPOSE 80
|
|
-EXPOSE 3012
|
|
-
|
|
-# Copies the files from the context (Rocket.toml file and web-vault)
|
|
-# and the binary from the "build" stage to the current stage
|
|
-COPY Rocket.toml .
|
|
-COPY --from=vault /web-vault ./web-vault
|
|
-COPY --from=build /app/target/release/bitwarden_rs .
|
|
-
|
|
-COPY docker/healthcheck.sh /healthcheck.sh
|
|
-COPY docker/start.sh /start.sh
|
|
+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
|
|
|
|
-HEALTHCHECK --interval=60s --timeout=10s CMD ["/healthcheck.sh"]
|
|
+WORKDIR /bitwarden_package
|
|
|
|
-# Configures the startup!
|
|
-WORKDIR /
|
|
-CMD ["/start.sh"]
|
|
+COPY debian/control /bitwarden_package/DEBIAN/control
|
|
+COPY debian/postinst /bitwarden_package/DEBIAN/postinst
|
|
+COPY debian/conffiles /bitwarden_package/DEBIAN/conffiles
|
|
+COPY git/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/release/bitwarden_rs /bitwarden_package/usr/local/bin
|
|
|
|
+# Create the package
|
|
+RUN dpkg-deb --build . bitwarden-rs.deb
|