Skip to content

Commit 1172cfc

Browse files
authored
Merge pull request #11 from devcontainer-config/dev
fix buildx
2 parents 0c2e3fd + 0530e4a commit 1172cfc

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ ARG TARGETOS
55
ARG TARGETARCH
66
FROM ${TARGETOS}-${TARGETARCH}-base
77

8-
COPY .local/docker /etc/devcontainer-config-setup
8+
COPY package/ /etc/devcontainer-config-setup
99

1010
ENTRYPOINT [ "/nodejs/bin/node", "/etc/devcontainer-config-setup/index.js" ]

docker/Dockerfile.dockerignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

scripts/buildx.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import { deploy } from "@/scripts/tasks/deploy.js";
99

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

12-
const packagePath = path.resolve(workspaces, "artifacts/package");
12+
const artifactsPath = path.resolve(workspaces, "artifacts");
13+
const packagePath = path.resolve(artifactsPath, "package");
1314

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

30-
args.push(projectRoot);
31-
32-
await $$`docker ${args}`;
31+
await $$`docker ${args} ${artifactsPath}`;
3332
console.log("Docker image built successfully.");
3433
}
3534

0 commit comments

Comments
 (0)