talexander/organic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Update the run targets for the Makefiles for the docker containers.

Browse Source 
This was previously using the standard docker makefile I use as a starting point for all of my docker makefiles. Now it will properly mount the source directory.
This commit is contained in:
Tom Alexander
2023-08-27 17:29:55 -04:00
parent cc86591a6c
commit 378b6bb391
8 changed files with 13 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker/cargo_fmt/Makefile
View File

@@ -26,10 +26,11 @@ else
@echo "REMOTE_REPO not defined, not removing from remote repo."
endif
# NOTE: This target will write to folders underneath the git-root
.PHONY: run
run:
docker run --rm -i -t $(IMAGE_NAME)
docker run --rm --init -v "$$(readlink -f ../../):/source" --workdir=/source $(IMAGE_NAME)
.PHONY: shell
shell:
docker run --rm -i -t --entrypoint /bin/bash $(IMAGE_NAME)
docker run --rm -i -t --entrypoint /bin/sh $(IMAGE_NAME)

2
docker/organic_build/Dockerfile
View File

@@ -2,3 +2,5 @@ FROM rustlang/rust:nightly-alpine3.17
RUN apk add --no-cache musl-dev
RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
ENTRYPOINT ["cargo", "build"]

5
docker/organic_build/Makefile
View File

@@ -26,10 +26,11 @@ else
@echo "REMOTE_REPO not defined, not removing from remote repo."
endif
# NOTE: This target will write to folders underneath the git-root
.PHONY: run
run:
docker run --rm -i -t $(IMAGE_NAME)
docker run --rm --init -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME)
.PHONY: shell
shell:
docker run --rm -i -t --entrypoint /bin/bash $(IMAGE_NAME)
docker run --rm -i -t --entrypoint /bin/sh $(IMAGE_NAME)

2
docker/organic_test/Dockerfile
View File

@@ -30,3 +30,5 @@ RUN apk add --no-cache musl-dev ncurses gnutls
RUN cargo install --locked --no-default-features --features ci-autoclean cargo-cache
COPY --from=build-emacs /root/dist/ /
COPY --from=build-org-mode /root/dist/ /
ENTRYPOINT ["cargo", "test"]

4
docker/organic_test/Makefile
View File

@@ -28,8 +28,8 @@ endif
.PHONY: run
run:
docker run --rm -i -t $(IMAGE_NAME)
docker run --rm --init -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME) --no-fail-fast --lib --test test_loader
.PHONY: shell
shell:
docker run --rm -i -t --entrypoint /bin/bash $(IMAGE_NAME)
docker run --rm -i -t --entrypoint /bin/sh $(IMAGE_NAME)