From f5358b13f5cf3b77589ed8e7b06195c89dc9a5a0 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Mon, 25 Feb 2019 12:17:22 +0000 Subject: [PATCH 1/2] Add Dockerfile for armv6 --- Dockerfile.armv6 | 92 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 Dockerfile.armv6 diff --git a/Dockerfile.armv6 b/Dockerfile.armv6 new file mode 100644 index 00000000..48508387 --- /dev/null +++ b/Dockerfile.armv6 @@ -0,0 +1,92 @@ +# Using multistage build: +# https://docs.docker.com/develop/develop-images/multistage-build/ +# https://whitfin.io/speeding-up-rust-docker-builds/ +####################### VAULT BUILD IMAGE ####################### +FROM alpine as vault + +ENV VAULT_VERSION "v2.8.0d" + +ENV URL "https://github.com/dani-garcia/bw_web_builds/releases/download/$VAULT_VERSION/bw_web_$VAULT_VERSION.tar.gz" + +RUN apk add --update-cache --upgrade \ + curl \ + tar + +RUN mkdir /web-vault +WORKDIR /web-vault + +RUN curl -L $URL | tar xz +RUN ls + +########################## BUILD IMAGE ########################## +# We need to use the Rust build image, because +# we need the Rust compiler and Cargo tooling +FROM rust as build + +RUN apt-get update \ + && apt-get install -y \ + gcc-arm-linux-gnueabi \ + && mkdir -p ~/.cargo \ + && echo '[target.arm-unknown-linux-gnueabi]' >> ~/.cargo/config \ + && echo 'linker = "arm-linux-gnueabi-gcc"' >> ~/.cargo/config + +ENV CARGO_HOME "/root/.cargo" +ENV USER "root" + +WORKDIR /app + +# Prepare openssl armel libs +RUN sed 's/^deb/deb-src/' /etc/apt/sources.list > \ + /etc/apt/sources.list.d/deb-src.list \ + && dpkg --add-architecture armel \ + && apt-get update \ + && apt-get install -y \ + libssl-dev:armel \ + libc6-dev:armel + +ENV CC_arm_unknown_linux_gnueabi="/usr/bin/arm-linux-gnueabi-gcc" +ENV CROSS_COMPILE="1" +ENV OPENSSL_INCLUDE_DIR="/usr/include/arm-linux-gnueabi" +ENV OPENSSL_LIB_DIR="/usr/lib/arm-linux-gnueabi" + +# Copies the complete project +# To avoid copying unneeded files, use .dockerignore +COPY . . + +# Build +RUN rustup target add arm-unknown-linux-gnueabi +RUN cargo build --release --target=arm-unknown-linux-gnueabi -v + +######################## RUNTIME IMAGE ######################## +# Create a new stage with a minimal image +# because we already have a binary built +FROM balenalib/rpi-debian:stretch + +ENV ROCKET_ENV "staging" +ENV ROCKET_PORT=80 +ENV ROCKET_WORKERS=10 + +RUN [ "cross-build-start" ] + +# Install needed libraries +RUN apt-get update && apt-get install -y\ + openssl\ + ca-certificates\ + --no-install-recommends\ + && rm -rf /var/lib/apt/lists/* + +RUN mkdir /data + +RUN [ "cross-build-end" ] + +VOLUME /data +EXPOSE 80 + +# 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/arm-unknown-linux-gnueabi/release/bitwarden_rs . + +# Configures the startup! +CMD ./bitwarden_rs \ No newline at end of file From 30e72a96a9b57879ffa1078e68636e9370afcd83 Mon Sep 17 00:00:00 2001 From: Miroslav Prasil Date: Mon, 25 Feb 2019 16:17:34 +0000 Subject: [PATCH 2/2] Symlink missing ld-linux file --- Dockerfile.armv6 | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile.armv6 b/Dockerfile.armv6 index 48508387..66840b48 100644 --- a/Dockerfile.armv6 +++ b/Dockerfile.armv6 @@ -73,6 +73,7 @@ RUN apt-get update && apt-get install -y\ openssl\ ca-certificates\ --no-install-recommends\ + && ln -s /lib/ld-linux-armhf.so.3 /lib/ld-linux.so.3\ && rm -rf /var/lib/apt/lists/* RUN mkdir /data