Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ ARG TARGETOS
ARG TARGETARCH
FROM ${TARGETOS}-${TARGETARCH}-base

COPY .local/docker /etc/devcontainer-config-setup
COPY package/ /etc/devcontainer-config-setup

ENTRYPOINT [ "/nodejs/bin/node", "/etc/devcontainer-config-setup/index.js" ]
2 changes: 0 additions & 2 deletions docker/Dockerfile.dockerignore

This file was deleted.

7 changes: 3 additions & 4 deletions scripts/buildx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import { deploy } from "@/scripts/tasks/deploy.js";

const platforms: string[] = ["linux/amd64", "linux/arm64"];

const packagePath = path.resolve(workspaces, "artifacts/package");
const artifactsPath = path.resolve(workspaces, "artifacts");
const packagePath = path.resolve(artifactsPath, "package");

async function buildImage(registry: string, imageName: string, tags: string[], publish: boolean) {
console.log("Building multi-arch Docker image...");
Expand All @@ -27,9 +28,7 @@ async function buildImage(registry: string, imageName: string, tags: string[], p
args.push("--push");
}

args.push(projectRoot);

await $$`docker ${args}`;
await $$`docker ${args} ${artifactsPath}`;
console.log("Docker image built successfully.");
}

Expand Down