Merge branch 'clean_up_docker'

2023-08-27 18:03:51 -04:00 · 2023-08-27 18:03:51 -04:00 · e9e6a8ff64
commit e9e6a8ff64
parent cc86591a6c b124317f30
10 changed files with 23 additions and 61 deletions
--- a/.lighthouse/pipeline-rust-build.yaml
+++ b/.lighthouse/pipeline-rust-build.yaml
@ -14,10 +14,6 @@ spec:
      - name: path-to-dockerfile
        description: The path to the Dockerfile
        type: string
-      - name: command
-        type: array
-        description: Command to run.
-        default: []
    tasks:
      - name: report-pending
        taskRef:
@ -92,8 +88,6 @@ spec:
        runAfter:
          - build-image
        params:
-          - name: command
-            value: ["$(params.command[*])"]
          - name: args
            value: ["--no-default-features"]
          - name: docker-image
@ -109,8 +103,6 @@ spec:
        runAfter:
          - run-image-none
        params:
-          - name: command
-            value: ["$(params.command[*])"]
          - name: args
            value: ["--no-default-features", "--features", "tracing"]
          - name: docker-image
@ -126,8 +118,6 @@ spec:
        runAfter:
          - run-image-tracing
        params:
-          - name: command
-            value: ["$(params.command[*])"]
          - name: args
            value: ["--no-default-features", "--features", "compare"]
          - name: docker-image
@ -143,8 +133,6 @@ spec:
        runAfter:
          - run-image-compare
        params:
-          - name: command
-            value: ["$(params.command[*])"]
          - name: args
            value: []
          - name: docker-image
@ -160,8 +148,6 @@ spec:
        runAfter:
          - run-image-default
        params:
-          - name: command
-            value: ["$(params.command[*])"]
          - name: args
            value: ["--no-default-features", "--features", "tracing,compare"]
          - name: docker-image
@ -256,5 +242,3 @@ spec:
      value: docker/organic_build/
    - name: path-to-dockerfile
      value: docker/organic_build/Dockerfile
-    - name: command
-      value: [cargo, build]
--- a/.lighthouse/pipeline-rust-test.yaml
+++ b/.lighthouse/pipeline-rust-test.yaml
@ -18,14 +18,6 @@ spec:
      - name: path-to-dockerfile
        description: The path to the Dockerfile
        type: string
-      - name: command
-        type: array
-        description: Command to run.
-        default: []
-      - name: args
-        type: array
-        description: Arguments passed to command.
-        default: []
    tasks:
      - name: do-stuff
        taskSpec:
@ -117,10 +109,8 @@ spec:
        runAfter:
          - build-image
        params:
-          - name: command
-            value: ["$(params.command[*])"]
          - name: args
-            value: ["$(params.args[*])"]
+            value: [--no-fail-fast, --lib, --test, test_loader]
          - name: docker-image
            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
    finally:
@ -212,7 +202,3 @@ spec:
      value: docker/organic_test/
    - name: path-to-dockerfile
      value: docker/organic_test/Dockerfile
-    - name: command
-      value: [cargo, test]
-    - name: args
-      value: [--lib, --test, test_loader]
--- a/.lighthouse/pipeline-rustfmt.yaml
+++ b/.lighthouse/pipeline-rustfmt.yaml
@ -14,14 +14,6 @@ spec:
      - name: path-to-dockerfile
        description: The path to the Dockerfile
        type: string
-      - name: rustfmt-command
-        type: array
-        description: Command to run rustfmt.
-        default: []
-      - name: rustfmt-args
-        type: array
-        description: Arguments passed to rustfmt.
-        default: []
      - name: GIT_USER_NAME
        description: The username for git
        type: string
@ -119,10 +111,6 @@ spec:
        runAfter:
          - build-image
        params:
-          - name: command
-            value: ["$(params.rustfmt-command[*])"]
-          - name: args
-            value: ["$(params.rustfmt-args[*])"]
          - name: docker-image
            value: "$(params.image-name):$(tasks.fetch-repository.results.commit)"
      - name: cargo-fix
@ -240,7 +228,3 @@ spec:
      value: docker/cargo_fmt/
    - name: path-to-dockerfile
      value: docker/cargo_fmt/Dockerfile
-    - name: command
-      value: [cargo, fmt]
-    - name: args
-      value: []
--- a/docker/cargo_fmt/Makefile
+++ b/docker/cargo_fmt/Makefile
@ -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)
+run: build
+	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)
+shell: build
+	docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source" --workdir=/source $(IMAGE_NAME)
--- a/docker/organic_build/Dockerfile
+++ b/docker/organic_build/Dockerfile
@ -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"]
--- a/docker/organic_build/Makefile
+++ b/docker/organic_build/Makefile
@ -25,11 +25,13 @@ ifdef REMOTE_REPO
 else
 	@echo "REMOTE_REPO not defined, not removing from remote repo."
 endif
+	docker volume rm cargo-cache

+# NOTE: This target will write to folders underneath the git-root
 .PHONY: run
-run:
-	docker run --rm -i -t $(IMAGE_NAME)
+run: build
+	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)
+shell: build
+	docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME)
--- a/docker/organic_test/Dockerfile
+++ b/docker/organic_test/Dockerfile
@ -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"]
--- a/docker/organic_test/Makefile
+++ b/docker/organic_test/Makefile
@ -25,11 +25,12 @@ ifdef REMOTE_REPO
 else
 	@echo "REMOTE_REPO not defined, not removing from remote repo."
 endif
+	docker volume rm rust-cache cargo-cache

 .PHONY: run
-run:
-	docker run --rm -i -t $(IMAGE_NAME)
+run: build
+	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)
+shell: build
+	docker run --rm -i -t --entrypoint /bin/sh -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)
--- a/scripts/run_docker_compare.bash
+++ b/scripts/run_docker_compare.bash
@ -46,7 +46,7 @@ function launch_container {
        additional_flags+=(--env RUST_BACKTRACE=full)
    fi

-    docker run "${additional_flags[@]}" --init --rm -i -v "$($REALPATH ./):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source organic-test "${additional_args[@]}"
+    docker run "${additional_flags[@]}" --init --rm -i -v "$($REALPATH ./):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test "${additional_args[@]}"
 }

 main "${@}"
--- a/scripts/run_docker_integration_test.bash
+++ b/scripts/run_docker_integration_test.bash
@ -56,7 +56,7 @@ cargo test --no-fail-fast --lib --test test_loader "$test" -- --show-output
 EOF
          )

-    docker run "${additional_flags[@]}" --init --rm -v "$($REALPATH ./):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source organic-test sh -c "$init_script"
+    docker run "${additional_flags[@]}" --init --rm -v "$($REALPATH ./):/source:ro" --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target -w /source --entrypoint "" organic-test sh -c "$init_script"
 }