cleanup Dockerfiles

sebadob · Jul 8, 2023 · 4531ae9 · 4531ae9
1 parent 1489efe
commit 4531ae9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 30 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,9 @@
-FROM rust:1.70-alpine3.18 AS builderBackend
+FROM alpine3.18 AS builderBackend
 
 WORKDIR /work
 
-COPY migrations/ ./migrations/
-COPY rauthy-common/ ./rauthy-common/
-COPY rauthy-handlers/ ./rauthy-handlers/
-COPY rauthy-main/ ./rauthy-main/
-COPY rauthy-models/ ./rauthy-models/
-COPY rauthy-service/ ./rauthy-service/
-COPY static ./static/
-COPY templates ./templates/
-COPY Cargo.* ./
-
+# Just a workaroudn to get an empty dir and be able to copy it over to scratch with
+# the correct access rights
 RUN mkdir data
 
 FROM scratch
@@ -20,7 +12,6 @@ USER 10001:10001
 
 WORKDIR /app
 
-#COPY --chown=10001:10001 --from=builderBackend /work/target/release/rauthy .
 COPY --chown=10001:10001 /out/rauthy .
 COPY --chown=10001:10001 --from=builderBackend /work/data ./data
 

diff --git a/Dockerfile.debug b/Dockerfile.debug
@@ -1,19 +1,3 @@
-FROM rust:1.70-alpine3.18 AS builderBackend
-
-WORKDIR /work
-
-COPY migrations/ ./migrations/
-COPY rauthy-common/ ./rauthy-common/
-COPY rauthy-handlers/ ./rauthy-handlers/
-COPY rauthy-main/ ./rauthy-main/
-COPY rauthy-models/ ./rauthy-models/
-COPY rauthy-service/ ./rauthy-service/
-COPY static ./static/
-COPY templates ./templates/
-COPY Cargo.* ./
-
-RUN mkdir data
-
 FROM alpine:3.18.2
 #FROM gcr.io/distroless/cc:debug
 #FROM gcr.io/distroless/cc
@@ -22,9 +6,8 @@ USER 10001:10001
 
 WORKDIR /app
 
-#COPY --chown=10001:10001 --from=builderBackend /work/target/release/rauthy .
 COPY --chown=10001:10001 /out/rauthy .
-COPY --chown=10001:10001 --from=builderBackend /work/data ./data
+RUN mkdir data
 
 COPY --chown=10001:10001 tls/ ./tls/
 COPY --chown=10001:10001 rauthy.deploy.cfg ./rauthy.cfg