docker deployment

.dockerignore

@@ -1 +1 @@
-/target
+target

.run/Dockerfile.run.xml

@@ -0,0 +1,53 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="twba-uploader" />
+        <option name="buildArgs">
+          <list>
+            <DockerEnvVarImpl>
+              <option name="name" value="PROGNAME" />
+              <option name="value" value="twba-uploader" />
+            </DockerEnvVarImpl>
+          </list>
+        </option>
+        <option name="buildKitEnabled" value="true" />
+        <option name="containerName" value="twba-uploader" />
+        <option name="envVars">
+          <list>
+            <DockerEnvVarImpl>
+              <option name="name" value="TWBA_CONFIG" />
+              <option name="value" value="/twba/configs/config.toml" />
+            </DockerEnvVarImpl>
+          </list>
+        </option>
+        <option name="commandLineOptions" value="--restart=unless-stopped" />
+        <option name="showCommandPreview" value="true" />
+        <option name="sourceFilePath" value="Dockerfile" />
+        <option name="volumeBindings">
+          <list>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/twba/configs/" />
+              <option name="hostPath" value="/twba/" />
+              <option name="readOnly" value="true" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/twba/tmp/" />
+              <option name="hostPath" value="/var/tmp/twba/" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/twba/data/" />
+              <option name="hostPath" value="/twba/data/" />
+            </DockerVolumeBindingImpl>
+            <DockerVolumeBindingImpl>
+              <option name="containerPath" value="/etc/ssl/certs" />
+              <option name="hostPath" value="/etc/ssl/certs" />
+              <option name="readOnly" value="true" />
+            </DockerVolumeBindingImpl>
+          </list>
+        </option>
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

Dockerfile

@@ -1,73 +1,44 @@
-# syntax=docker/dockerfile:1
-
-# Comments are provided throughout this file to help you get started.
-# If you need more help, visit the Dockerfile reference guide at
-# https://docs.docker.com/engine/reference/builder/
-
-################################################################################
-# Create a stage for building the application.
-
-ARG RUST_VERSION=1.73.0
-ARG APP_NAME=uploader
-FROM rust:${RUST_VERSION}-slim-bullseye AS build
-ARG APP_NAME
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
 WORKDIR /app
-RUN apt-get update
-RUN apt-get install -y pkg-config
-RUN apt-get install -y libssl-dev
-RUN apt-get install -y libudev-dev
-RUN apt-get install -y git
-# Build the application.
-# Leverage a cache mount to /usr/local/cargo/registry/
-# for downloaded dependencies and a cache mount to /app/target/ for
-# compiled dependencies which will speed up subsequent builds.
-# Leverage a bind mount to the src directory to avoid having to copy the
-# source code into the container. Once built, copy the executable to an
-# output directory before the cache mounted /app/target is unmounted.
-RUN --mount=type=bind,source=src,target=src \
-    --mount=type=bind,source=Cargo.toml,target=Cargo.toml \
-    --mount=type=bind,source=Cargo.lock,target=Cargo.lock \
-    --mount=type=bind,source=.cargo/config.toml,target=.cargo/config.toml \
-    --mount=type=cache,target=/app/target/ \
-    --mount=type=cache,target=/usr/local/cargo/registry/ \
-#    --mount=type=bind,source=migrations,target=migrations \
-    <<EOF
-set -e
-cargo build --locked --release
-cp ./target/release/$APP_NAME /bin/server
-EOF
 
-################################################################################
-# Create a new stage for running the application that contains the minimal
-# runtime dependencies for the application. This often uses a different base
-# image from the build stage where the necessary files are copied from the build
-# stage.
-#
-# The example below uses the debian bullseye image as the foundation for    running the app.
-# By specifying the "bullseye-slim" tag, it will also use whatever happens to    be the
-# most recent version of that tag when you build your Dockerfile. If
-# reproducability is important, consider using a digest
-# (e.g.,    debian@sha256:ac707220fbd7b67fc19b112cee8170b41a9e97f703f588b2cdbbcdcecdd8af57).
-FROM debian:bullseye-slim AS final
+FROM chef AS planner
+COPY /src  ./src
+COPY /Cargo.toml  .
+COPY /Cargo.lock  .
+RUN cargo chef prepare --recipe-path recipe.json
 
-RUN apt-get update
-RUN apt-get install -y ca-certificates
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
+# Build dependencies - this is the caching Docker layer!
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/home/root/app/target \
+    cargo chef cook --release --locked --recipe-path recipe.json
+# Build application
+COPY /src  ./src
+COPY /Cargo.toml  .
+COPY /Cargo.lock  .
+RUN --mount=type=cache,target=/usr/local/cargo/registry \
+    --mount=type=cache,target=/home/root/app/target \
+    cargo build --release --locked
 
-# Create a non-privileged user that the app will run under.
-# See https://docs.docker.com/develop/develop-images/dockerfile_best-practices/   #user
-#ARG UID=10001
-#RUN adduser \
-#    --disabled-password \
-#    --gecos "" \
-#    --home "/nonexistent" \
-#    --shell "/sbin/nologin" \
-#    --no-create-home \
-#    --uid "${UID}" \
-#    appuser
-#USER appuser
+# We do not need the Rust toolchain to run the binary!
+FROM debian:bookworm AS runtime
+WORKDIR /app
+ARG PROGNAME
+RUN apt-get update && apt-get install -y libssl-dev coreutils
+# Create a script to run the command and sleep for one hour after the command is done
+RUN echo "#!/bin/bash \n \
+          echo \"Running command: '$PROGNAME'\" \n \
+          # Run your command \n \
+          $PROGNAME \n \
+          echo \"Done with normal command. Sleeping for one hour\" \n \
+          # Sleep for one hour \n \
+          sleep 3600 \n \
+          echo \"Done with sleep. Exiting\" \
+          " > /app/entrypoint.sh
 
-# Copy the executable from the "build" stage.
-COPY --from=build /bin/server /bin/
+# Make the script executable
+RUN chmod +x /app/entrypoint.sh
+COPY --from=builder /app/target/release/$PROGNAME /usr/local/bin/$PROGNAME
 
-# What the container should run when it is started.
-CMD ["/bin/server"]
+CMD ["/app/entrypoint.sh"]

src/main.rs

@@ -24,6 +24,7 @@ lazy_static! {
         )
         .file("./settings.toml")
         .file(shellexpand::tilde("~/twba/config.toml").into_owned())
+        .file(std::env::var("TWBA_CONFIG").unwrap_or_else(|_| "~/twba/config.toml".to_string()))
         .load()
         .map_err(|e| UploaderError::LoadConfig(e.into()))
         .expect("Failed to load config");