Simplify build

replicate · Jan 9, 2025 · 8382b8a · 8382b8a
1 parent d4930a1
commit 8382b8a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -33,11 +33,6 @@ ENV UV_PYTHON_PREFERENCE=only-managed
 ENV UV_TOOL_BIN_DIR=$PREFIX/bin
 ENV UV_TOOL_DIR=$PREFIX/uv/tools
 
-ADD ./apt-dependencies.txt /tmp/apt-dependencies.txt
-RUN apt-get update \
-    && apt-get install -y $(grep -v '^#' </tmp/apt-dependencies.txt) \
-    && rm -rf /var/lib/apt/lists/* /tmp/apt-dependencies.txt
-
 RUN --mount=type=bind,from=build,target=/tmp/build-layer,ro \
     ln -sv /usr/bin/tini /sbin/tini \
     && mkdir -p /opt/r8/monobase /tmp/r8 \

diff --git a/runtime.Dockerfile b/runtime.Dockerfile
@@ -5,12 +5,12 @@ ENV MONOBASE_PREFIX=/srv/r8/monobase
 ENV PATH=$MONOBASE_PREFIX/bin:$PATH
 ENV TZ=Etc/UTC
 
-ADD ./apt-dependencies.txt /tmp/apt-dependencies.txt
+RUN --mount=type=bind,src=.,dst=/src,ro \
 RUN apt-get update \
-    && apt-get install -y $(grep -v '^#' </tmp/apt-dependencies.txt) \
-    && rm -rf /var/lib/apt/lists/* /tmp/apt-dependencies.txt
+    && apt-get install -y $(grep -v '^#' </src/apt-dependencies.txt) \
+    && rm -rf /var/lib/apt/lists/*
 
-RUN --mount=type=bind,src=../../,dst=/src,ro \
+RUN --mount=type=bind,src=.,dst=/src,ro \
     ln -sv /usr/bin/tini /sbin/tini \
     && mkdir -p /opt/r8/monobase \
     && ls -la /src/ \