Prefer buildctx to bind-mounts for prebuilt binaries

This is a little slower, but it removes a whole bunch of permission
errors that can arise if docker users don't belong to certain groups.

Author: jacob-hughes

.dockerignore

@@ -5,3 +5,4 @@ plots/
 artefacts/
 src/
 !src/parserbench
+!artefacts/prebuilt

Dockerfile

@@ -7,7 +7,8 @@ FROM base as build
 WORKDIR /app
 
 # Add build argument for prebuilt binaries
-ARG PREBUILT_BINS=false
+ARG BUILD_QUICK=false
+ENV BUILD_QUICK=${BUILD_QUICK}
 
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt/lists,sharing=locked \
@@ -42,13 +43,15 @@ RUN --mount=type=cache,target=/root/.cache/pip \
     pip install --upgrade pip --break-system-packages && \
     pip install .[dev] --break-system-packages
 
+RUN mkdir -p /app/artefacts
+
 COPY . .
 
-RUN --mount=type=cache,target=/app/artefacts \
-    if [ "$PREBUILT_BINS" = "false" ]; then \
+RUN if [ "$BUILD_QUICK" = "false" ]; then \
     invoke build-benchmarks; \
     else \
     echo "Using prebuilt binaries"; \
+    cp -r ./artefacts/prebuilt /app/artefacts/; \
     fi
 
 

Makefile

@@ -32,14 +32,13 @@ run-quick: fetch-binaries
 	docker buildx build \
 		--target runtime \
 		--tag $(IMAGE_quick) \
-		--build-arg PREBUILT_BINS=true \
+		--build-arg QUICK_BUILD=true \
 		--load .
 	@test -f $(LOGFILE) || touch $(LOGFILE)
 	chmod a+w $(LOGFILE)
 	docker run --rm -it \
 		--mount type=bind,source="$(LOGFILE)",target=/app/experiment.log \
 		--mount type=bind,source="$(RESULTS)",target=/app/results \
-		--mount type=bind,source="$(PREBUILT_BIN)",target=/app/artefacts/bin \
 		$(IMAGE_quick)
 
 run-full: