diff --git a/docker/Dockerfile b/docker/Dockerfile index 467939c..4785af2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -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" ] diff --git a/docker/Dockerfile.dockerignore b/docker/Dockerfile.dockerignore deleted file mode 100644 index 59646cf..0000000 --- a/docker/Dockerfile.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.local/docker/ diff --git a/scripts/buildx.ts b/scripts/buildx.ts index 694bcd6..01fa209 100644 --- a/scripts/buildx.ts +++ b/scripts/buildx.ts @@ -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..."); @@ -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."); }