diff options
| author | Elizabeth <me@liz.coffee> | 2025-06-02 18:10:03 -0700 |
|---|---|---|
| committer | Elizabeth <me@liz.coffee> | 2025-06-02 18:10:03 -0700 |
| commit | a2c8702ff7000ff5ce142967054815d98eb12b3f (patch) | |
| tree | ede87527dc97038a55bbd9383ddd31015b311f84 | |
| parent | d9c418425b035f00c950e6a83df9470d7af80413 (diff) | |
| download | ci-a2c8702ff7000ff5ce142967054815d98eb12b3f.tar.gz ci-a2c8702ff7000ff5ce142967054815d98eb12b3f.zip | |
Fix casing in image build targets and img names
| -rw-r--r-- | .ci/ci.ts | 6 | ||||
| -rw-r--r-- | worker/Dockerfile | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -28,8 +28,8 @@ const getPipeline = () => { arguments: { ...commonBuildArgs, context: gitHookPipeline.getSourceDestination(), - repository: IMG + "-base", - buildTarget: IMG + "-base", + repository: IMG + "_base", + buildTarget: IMG + "_base", dockerfile: "Dockerfile", }, }; @@ -41,7 +41,7 @@ const getPipeline = () => { type: "build_docker_image", arguments: { ...commonBuildArgs, - repository: `${IMG}-${_package}`, + repository: `${IMG}_${_package}`, buildTarget: _package, dockerfile: `${_package}/Dockerfile`, }, diff --git a/worker/Dockerfile b/worker/Dockerfile index 24193be..2f43785 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,5 +1,5 @@ # -- <worker.dependencies> -- -FROM debian:stable-slim AS worker-dependencies +FROM debian:stable-slim AS worker_dependencies # Define versions as build arguments to improve caching ARG BITWARDEN_VERSION=2025.4.0 @@ -21,8 +21,8 @@ RUN groupadd docker RUN useradd --system --home-dir /var/lib/laminar \ --no-user-group --groups users,docker --uid 100 laminar -COPY --from=worker-dependencies /bw /usr/local/bin/ -COPY --from=worker-dependencies /docker/* /usr/local/bin/ +COPY --from=worker_dependencies /bw /usr/local/bin/ +COPY --from=worker_dependencies /docker/* /usr/local/bin/ RUN mkdir -p /var/lib/laminar/cfg RUN cp -r /app/worker/* /var/lib/laminar/cfg |