Fixes dockerfile context & path

4 files changed, 9 insertions, 5 deletions

diff --git a/.ci/ci.cjs b/.ci/ci.cjs
index 0fa8947..323c561 100755
--- a/.ci/ci.cjs
+++ b/.ci/ci.cjs
@@ -509,7 +509,7 @@ var DefaultGitHookPipelineBuilder = class extends BasePipelineBuilder {
     });
   }
   getSourceDestination() {
-    return this.remoteUrl.split("/").at(-1) ?? "src";
+    return this.remoteUrl.replace(".git", "").split("/").at(-1) ?? "src";
   }
   getBranch() {
     const branchRefPrefix = "refs/heads/";
diff --git a/Dockerfile b/Dockerfile
index cd8c3ea..d37306e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,8 @@ RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
     capnproto \
     cmake \
     git \
+    curl \
+    ca-certificates \
     libboost-dev \
     libcapnp-dev \
     libsqlite3-dev \
@@ -16,7 +18,8 @@ RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \
     rapidjson-dev \
     zlib1g-dev
 
-ADD --keep-git-dir https://github.com/ohwgiles/laminar.git /opt/laminar/src
+RUN mkdir /opt/laminar
+RUN git clone https://github.com/ohwgiles/laminar /opt/laminar/src
 
 RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja  \
     -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && \
@@ -28,7 +31,7 @@ RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja  \
 FROM node:22-slim AS ci_base
 
 RUN apt-get update -yqq && apt-get install -yqq libcapnp-0.9.2 \
-    libsqlite3-0 zlib1g curl bash ca-certificates
+    libsqlite3-0 zlib1g curl bash
 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
diff --git a/model/pipeline/builder.ts b/model/pipeline/builder.ts
index b15a044..abd4f1e 100644
--- a/model/pipeline/builder.ts
+++ b/model/pipeline/builder.ts
@@ -42,7 +42,7 @@ export class DefaultGitHookPipelineBuilder extends BasePipelineBuilder {
     }
 
     public getSourceDestination() {
-        return this.remoteUrl.split('/').at(-1) ?? 'src';
+        return this.remoteUrl.replace('.git', '').split('/').at(-1) ?? 'src';
     }
 
     public getBranch(): string | undefined {
diff --git a/worker/scripts/build_docker_image.ts b/worker/scripts/build_docker_image.ts
index fb25eb3..fffeef3 100755
--- a/worker/scripts/build_docker_image.ts
+++ b/worker/scripts/build_docker_image.ts
@@ -11,6 +11,7 @@ import {
 } from '@emprespresso/pengueno';
 import type { BuildDockerImageJob, BuildDockerImageJobProps } from '@emprespresso/ci_model';
 import { Bitwarden, type LoginItem } from '@emprespresso/ci_worker';
+import path from 'path';
 
 const job = getRequiredEnvVars([
     'registry',
@@ -122,7 +123,7 @@ function getDockerLoginCommand(username: string, registry: string): Command {
 }
 
 function getBuildCommand({ buildTarget, imageTag, dockerfile, context }: BuildDockerImageJobProps): Command {
-    return ['docker', 'build', '--target', buildTarget, '-t', imageTag, '-f', dockerfile, context];
+    return ['docker', 'build', '--target', buildTarget, '-t', imageTag, '-f', path.join(context, dockerfile), context];
 }
 
 function getPushCommand(tag: string): Command {