From 88119758805a38dd26505b90ae6f2cdc71694c8b Mon Sep 17 00:00:00 2001 From: John Martin Date: Sat, 23 Nov 2024 07:13:50 +0000 Subject: [PATCH] build: update build config --- .../base-devcontainer/package.json | 4 ---- .../base-devcontainer/project.json | 9 ++++----- .../node-devcontainer/package.json | 4 ---- .../node-devcontainer/project.json | 16 +++++++--------- .../node-dind-devcontainer/package.json | 4 ---- .../node-dind-devcontainer/project.json | 7 +++---- .../package.json | 4 ---- .../project.json | 5 ++--- .../node-playwright-devcontainer/package.json | 4 ---- .../node-playwright-devcontainer/project.json | 5 ++--- release-config.json | 10 +++++----- 11 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 devcontainer-images/base-devcontainer/package.json delete mode 100644 devcontainer-images/node-devcontainer/package.json delete mode 100644 devcontainer-images/node-dind-devcontainer/package.json delete mode 100644 devcontainer-images/node-dind-playwright-devcontainer/package.json delete mode 100644 devcontainer-images/node-playwright-devcontainer/package.json diff --git a/devcontainer-images/base-devcontainer/package.json b/devcontainer-images/base-devcontainer/package.json deleted file mode 100644 index e206605..0000000 --- a/devcontainer-images/base-devcontainer/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@ebizbase/base-devcontainer", - "version": "1.0.0" -} diff --git a/devcontainer-images/base-devcontainer/project.json b/devcontainer-images/base-devcontainer/project.json index 839c36b..70d5978 100644 --- a/devcontainer-images/base-devcontainer/project.json +++ b/devcontainer-images/base-devcontainer/project.json @@ -5,9 +5,8 @@ "projectType": "application", "tags": [], "metadata": { - "$schema": "../../nx-plugins/nx-devcontainer/metadata.schema.json", "version": "1.0.0", - "registries": ["docker.io", "ghcr.io"], + "registries": ["ghcr.io"], "namespace": "ebizbase/base-devcontainer", "labels": { "org.opencontainers.image.source": "https://github.com/ebizbase/dev-infras", @@ -27,9 +26,9 @@ "executor": "nx:run-commands", "options": { "commands": [ - "docker run --rm ebizbase/base-devcontainer:edge zsh --version", - "docker run --rm ebizbase/base-devcontainer:edge git --version", - "docker run --rm ebizbase/base-devcontainer:edge git lfs --version" + "docker run --rm ghcr.io/ebizbase/base-devcontainer:edge zsh --version", + "docker run --rm ghcr.io/ebizbase/base-devcontainer:edge git --version", + "docker run --rm ghcr.io/ebizbase/base-devcontainer:edge git lfs --version" ], "parallel": false } diff --git a/devcontainer-images/node-devcontainer/package.json b/devcontainer-images/node-devcontainer/package.json deleted file mode 100644 index d323ddb..0000000 --- a/devcontainer-images/node-devcontainer/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@ebizbase/node-devcontainer", - "version": "1.0.0" -} diff --git a/devcontainer-images/node-devcontainer/project.json b/devcontainer-images/node-devcontainer/project.json index 28d54b8..96ebe84 100644 --- a/devcontainer-images/node-devcontainer/project.json +++ b/devcontainer-images/node-devcontainer/project.json @@ -4,16 +4,14 @@ "sourceRoot": "devcontainer-images/node-devcontainer", "projectType": "application", "metadata": { - "$schema": "../../nx-plugins/nx-devcontainer/metadata.schema.json", "version": "1.0.0", "registries": [ - "docker.io", "ghcr.io" ], "namespace": "ebizbase/node-devcontainer", "labels": { "org.opencontainers.image.source": "https://github.com/ebizbase/dev-infras", - "org.opencontainers.image.description": "NodeJS devcontainer image for ebizbase", + "org.opencontainers.image.description": "The image base on `base-devcontainer` with latest NodeJS LTS version (includes npm, pnpm, yarn, bun)", "org.opencontainers.image.licenses": "MIT" } }, @@ -33,12 +31,12 @@ "executor": "nx:run-commands", "options": { "commands": [ - "docker run --rm ebizbase/node-devcontainer:edge node --version", - "docker run --rm ebizbase/node-devcontainer:edge npm --version", - "docker run --rm ebizbase/node-devcontainer:edge pnpm --version", - "docker run --rm ebizbase/node-devcontainer:edge yarn --version", - "docker run --rm ebizbase/node-devcontainer:edge bun --version", - "docker run --rm ebizbase/node-devcontainer:edge nx --version" + "docker run --rm ghcr.io/ebizbase/node-devcontainer:edge node --version", + "docker run --rm ghcr.io/ebizbase/node-devcontainer:edge npm --version", + "docker run --rm ghcr.io/ebizbase/node-devcontainer:edge pnpm --version", + "docker run --rm ghcr.io/ebizbase/node-devcontainer:edge yarn --version", + "docker run --rm ghcr.io/ebizbase/node-devcontainer:edge bun --version", + "docker run --rm ghcr.io/ebizbase/node-devcontainer:edge nx --version" ], "parallel": false } diff --git a/devcontainer-images/node-dind-devcontainer/package.json b/devcontainer-images/node-dind-devcontainer/package.json deleted file mode 100644 index c1c847c..0000000 --- a/devcontainer-images/node-dind-devcontainer/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@ebizbase/node-dind-devcontainer", - "version": "1.0.0" -} diff --git a/devcontainer-images/node-dind-devcontainer/project.json b/devcontainer-images/node-dind-devcontainer/project.json index dbdf4f6..814d7de 100644 --- a/devcontainer-images/node-dind-devcontainer/project.json +++ b/devcontainer-images/node-dind-devcontainer/project.json @@ -7,13 +7,12 @@ "$schema": "../../nx-plugins/nx-devcontainer/metadata.schema.json", "version": "1.0.0", "registries": [ - "docker.io", "ghcr.io" ], "namespace": "ebizbase/node-dind-devcontainer", "labels": { "org.opencontainers.image.source": "https://github.com/ebizbase/dev-infras", - "org.opencontainers.image.description": "NodeJS devcontainer image for ebizbase", + "org.opencontainers.image.description": "The image base on `node-devcontainer` with docker in docker", "org.opencontainers.image.licenses": "MIT" } }, @@ -33,8 +32,8 @@ "executor": "nx:run-commands", "options": { "commands": [ - "docker run --rm ebizbase/node-dind-devcontainer:edge node --version", - "docker run --rm ebizbase/node-dind-devcontainer:edge docker --version" + "docker run --rm ghcr.io/ebizbase/node-dind-devcontainer:edge node --version", + "docker run --rm ghcr.io/ebizbase/node-dind-devcontainer:edge docker --version" ], "parallel": false } diff --git a/devcontainer-images/node-dind-playwright-devcontainer/package.json b/devcontainer-images/node-dind-playwright-devcontainer/package.json deleted file mode 100644 index 40bef36..0000000 --- a/devcontainer-images/node-dind-playwright-devcontainer/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@ebizbase/node-dind-playwright-devcontainer", - "version": "1.0.0" -} diff --git a/devcontainer-images/node-dind-playwright-devcontainer/project.json b/devcontainer-images/node-dind-playwright-devcontainer/project.json index 039e98d..106507d 100644 --- a/devcontainer-images/node-dind-playwright-devcontainer/project.json +++ b/devcontainer-images/node-dind-playwright-devcontainer/project.json @@ -7,13 +7,12 @@ "$schema": "../../nx-plugins/nx-devcontainer/metadata.schema.json", "version": "1.0.0", "registries": [ - "docker.io", "ghcr.io" ], "namespace": "ebizbase/node-dind-playwright-devcontainer", "labels": { "org.opencontainers.image.source": "https://github.com/ebizbase/dev-infras", - "org.opencontainers.image.description": "NodeJS devcontainer image for ebizbase", + "org.opencontainers.image.description": "The image base on `node-dind-devcontainer` with playwright installed (both OS dependencies and browser binary)", "org.opencontainers.image.licenses": "MIT" } }, @@ -33,7 +32,7 @@ "executor": "nx:run-commands", "options": { "commands": [ - "docker run --rm ebizbase/node-dind-playwright-devcontainer:edge node --version" + "docker run --rm ghcr.io/ebizbase/node-dind-playwright-devcontainer:edge node --version" ], "parallel": false } diff --git a/devcontainer-images/node-playwright-devcontainer/package.json b/devcontainer-images/node-playwright-devcontainer/package.json deleted file mode 100644 index f622101..0000000 --- a/devcontainer-images/node-playwright-devcontainer/package.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "@ebizbase/node-playwright-devcontainer", - "version": "1.0.0" -} diff --git a/devcontainer-images/node-playwright-devcontainer/project.json b/devcontainer-images/node-playwright-devcontainer/project.json index dff171d..bf6fd40 100644 --- a/devcontainer-images/node-playwright-devcontainer/project.json +++ b/devcontainer-images/node-playwright-devcontainer/project.json @@ -7,13 +7,12 @@ "$schema": "../../nx-plugins/nx-devcontainer/metadata.schema.json", "version": "1.0.0", "registries": [ - "docker.io", "ghcr.io" ], "namespace": "ebizbase/node-playwright-devcontainer", "labels": { "org.opencontainers.image.source": "https://github.com/ebizbase/dev-infras", - "org.opencontainers.image.description": "NodeJS devcontainer image for ebizbase", + "org.opencontainers.image.description": "The image base on `node-devcontainer` with playwright installed (both OS dependencies and browser binary)", "org.opencontainers.image.licenses": "MIT" } }, @@ -33,7 +32,7 @@ "executor": "nx:run-commands", "options": { "commands": [ - "docker run --rm ebizbase/node-playwright-devcontainer:edge node --version" + "docker run --rm ghcr.io/ebizbase/node-playwright-devcontainer:edge node --version" ], "parallel": false } diff --git a/release-config.json b/release-config.json index 13bbdf4..30d4e61 100644 --- a/release-config.json +++ b/release-config.json @@ -55,7 +55,7 @@ ] }, "devcontainer-images/base-devcontainer": { - "release-type": "node", + "package-name": "base-devcontainer", "extra-files": [ { "type": "json", @@ -65,7 +65,7 @@ ] }, "devcontainer-images/node-devcontainer": { - "release-type": "node", + "package-name": "node-devcontainer", "extra-files": [ { "type": "json", @@ -75,7 +75,7 @@ ] }, "devcontainer-images/node-dind-devcontainer": { - "release-type": "node", + "package-name": "node-dind-devcontainer", "extra-files": [ { "type": "json", @@ -85,7 +85,7 @@ ] }, "devcontainer-images/node-dind-playwright-devcontainer": { - "release-type": "node", + "package-name": "node-dind-playwright-devcontainer", "extra-files": [ { "type": "json", @@ -95,7 +95,7 @@ ] }, "devcontainer-images/node-playwright-devcontainer": { - "release-type": "node", + "package-name": "node-playwright-devcontainer", "extra-files": [ { "type": "json",