Remove at symbol in registry namespace, guess it's not valid

4 files changed, 21 insertions, 11 deletions

diff --git a/.ci/ci.ts b/.ci/ci.ts
index 985b9ee..7c96b80 100644
--- a/.ci/ci.ts
+++ b/.ci/ci.ts
@@ -8,7 +8,7 @@ import {
 } from "@emprespresso/ci-model";
 
 const REGISTRY = "oci.liz.coffee";
-const NAMESPACE = "@emprespresso";
+const NAMESPACE = "emprespresso";
 const IMG = "ci";
 const REMOTE = "ssh://src.liz.coffee:2222";
 
diff --git a/Dockerfile b/Dockerfile
index 5984aa1..9c1ba66 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:stable-slim AS laminar
+# -- <laminar_bin> --
+FROM debian:stable-slim AS laminar-bin
 ENV DEBIAN_FRONTEND=noninteractive
 RUN useradd --system --home-dir /var/lib/laminar --no-user-group --groups users --uid 100 laminar
 RUN rm -rf /etc/cron.d/e2scrub_all
@@ -22,20 +23,23 @@ RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja  \
     -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && \
     cmake --build /opt/laminar/build && \
     cmake --install /opt/laminar/build --strip
+# -- </laminar_bin> --
 
+# -- <ci_base> --
 FROM denoland/deno:debian AS ci-base
 
 RUN apt-get update -yqq && apt-get install -yqq libcapnp-0.9.2 \
     libsqlite3-0 zlib1g curl bash
-COPY --from=laminar /usr/sbin/laminard /usr/sbin/laminard
-COPY --from=laminar /usr/bin/laminarc /usr/bin/laminarc
-COPY --from=laminar /usr/share/man/man8/laminard.8.gz /usr/share/man/man8/laminard.8.gz
-COPY --from=laminar /usr/share/man/man1/laminarc.1.gz /usr/share/man/man1/laminarc.1.gz
-COPY --from=laminar /etc/laminar.conf /etc/laminar.conf
-COPY --from=laminar /usr/share/bash-completion/completions/laminarc /usr/share/bash-completion/completions/laminarc
-COPY --from=laminar /usr/share/zsh/site-functions/_laminarc /usr/share/zsh/site-functions/_laminarc
+COPY --from=laminar-bin /usr/sbin/laminard /usr/sbin/laminard
+COPY --from=laminar-bin /usr/bin/laminarc /usr/bin/laminarc
+COPY --from=laminar-bin /usr/share/man/man8/laminard.8.gz /usr/share/man/man8/laminard.8.gz
+COPY --from=laminar-bin /usr/share/man/man1/laminarc.1.gz /usr/share/man/man1/laminarc.1.gz
+COPY --from=laminar-bin /etc/laminar.conf /etc/laminar.conf
+COPY --from=laminar-bin /usr/share/bash-completion/completions/laminarc /usr/share/bash-completion/completions/laminarc
+COPY --from=laminar-bin /usr/share/zsh/site-functions/_laminarc /usr/share/zsh/site-functions/_laminarc
 
 WORKDIR /app
 COPY . /app
 
 ENTRYPOINT [ "/bin/bash", "-c" ]
+# -- </ci_base> --
diff --git a/hooks/Dockerfile b/hooks/Dockerfile
index b4729db..a8b6c75 100644
--- a/hooks/Dockerfile
+++ b/hooks/Dockerfile
@@ -1,6 +1,8 @@
-FROM oci.liz.coffee/@emprespresso/ci-base:release AS hooks
+# -- <ci-hooks> --
+FROM oci.liz.coffee/emprespresso/ci-base:release AS hooks
 
 HEALTHCHECK --interval=10s --retries=3 --start-period=3s \
     CMD [ "curl --fail http://localhost:9000/health" ]
 
 CMD [ "/app/hooks/mod.ts" ]
+# -- </ci-hooks> --
diff --git a/worker/Dockerfile b/worker/Dockerfile
index c58789a..d87d67f 100644
--- a/worker/Dockerfile
+++ b/worker/Dockerfile
@@ -1,3 +1,4 @@
+# -- <worker_dependencies> --
 FROM debian:stable-slim AS worker-dependencies
 
 # Define versions as build arguments to improve caching
@@ -10,8 +11,10 @@ RUN unzip /bw-linux.zip -d / \
 
 RUN curl -L "https://get.docker.com/builds/$(uname -s)/$(uname -m)/docker-latest.tgz" > /docker.tgz
 RUN tar -xvzf /docker.tgz
+# -- </worker_dependencies> --
 
-FROM oci.liz.coffee/@emprespresso/ci-base:release AS worker
+# -- <ci_worker> --
+FROM oci.liz.coffee/emprespresso/ci-base:release AS worker
 
 RUN apt-get update && apt-get install -yqq git jq
 RUN groupadd docker
@@ -33,3 +36,4 @@ HEALTHCHECK --interval=10s --retries=3 --start-period=3s \
     CMD [ "/usr/bin/laminarc show-jobs" ]
 
 CMD [ "/usr/sbin/laminard" ]
+# -- </ci_worker> --