rename to secondary

Aaavm · Aug 31, 2022 · 01513f7 · 01513f7
1 parent 55c385b
commit 01513f7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 20 deletions.
diff --git a/.github/workflows/push-again.yml b/.github/workflows/push-again.yml
@@ -53,7 +53,7 @@ jobs:
  REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
  STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
  STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
- VSCODE_REGISTRY_BASE_PATH: ${{ secrets.VSCODE_REGISTRY_BASE_PATH }}
+ SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
  run: |
  set -e
 
@@ -78,5 +78,5 @@ jobs:
  --registry-path "$REGISTRY_BASE_PATH" \
  --stub-registry "$STUB_REGISTRY" \
  --stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
- --vscode-registry-path "$VSCODE_REGISTRY_BASE_PATH" \
+ --secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH" \
  ${{ github.event.inputs.image }}
diff --git a/.github/workflows/push-dev.yml b/.github/workflows/push-dev.yml
@@ -43,7 +43,7 @@ jobs:
  REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
  STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
  STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
- VSCODE_REGISTRY_BASE_PATH: ${{ secrets.VSCODE_REGISTRY_BASE_PATH }}
+ SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
  run: |
  set -e
 
@@ -66,7 +66,7 @@ jobs:
  --registry-path "$REGISTRY_BASE_PATH" \
  --stub-registry "$STUB_REGISTRY" \
  --stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
- --vscode-registry-path "$VSCODE_REGISTRY_BASE_PATH"
+ --secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH"
 
  image-info:
  name: Trigger info extraction

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -47,7 +47,7 @@ jobs:
  REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
  STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
  STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
- VSCODE_REGISTRY_BASE_PATH: ${{ secrets.VSCODE_REGISTRY_BASE_PATH }}
+ SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
  run: |
  set -e
 
@@ -66,7 +66,7 @@ jobs:
  --registry-path "$REGISTRY_BASE_PATH" \
  --stub-registry "$STUB_REGISTRY" \
  --stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
- --vscode-registry-path "$VSCODE_REGISTRY_BASE_PATH"
+ --secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH"
 
  image-info:
  name: Trigger info extraction

diff --git a/build/README.md b/build/README.md
@@ -46,7 +46,7 @@ Once you have your build configuration setup, you can use the `vscdc` CLI to tes
 1. First, build the image(s) using the CLI as follows:
 
  ```bash
- build/vscdc push --no-push --registry mcr.microsoft.com --registry-path devcontainers --release main <your-image-name-here>
+ build/vscdc push --no-push --registry mcr.microsoft.com --registry-path devcontainers --release main <your-image-name-here>VS Code Tags
  ```
 
 2. Use the Docker CLI to verify all of the expected images and tags and have the right contents:

diff --git a/build/config.json b/build/config.json
@@ -1,7 +1,7 @@
 {
  "containerRegistry": "devcon.azurecr.io",
  "containerRegistryPath": "public/devcontainers",
- "vscodeContainerRegistryPath": "public/vscode/devcontainers",
+ "secondaryContainerRegistryPath": "public/vscode/devcontainers",
  "stubRegistry": "mcr.microsoft.com",
  "stubRegistryPath": "devcontainers",
  "githubRepoName": "devcontainers/images",

diff --git a/build/src/push.js b/build/src/push.js
@@ -11,7 +11,7 @@ const prep = require('./prep');
 const builderName = 'dev-containers-builder';
 
 async function push(repo, release, updateLatest, registry, registryPath, stubRegistry,
- stubRegistryPath, pushImages, prepOnly, definitionsToSkip, page, pageTotal, replaceImages, definitionId, vscodeRegistryPath) {
+ stubRegistryPath, pushImages, prepOnly, definitionsToSkip, page, pageTotal, replaceImages, definitionId, secondaryRegistryPath) {
 
  // Optional argument defaults
  prepOnly = typeof prepOnly === 'undefined' ? false : prepOnly;
@@ -45,14 +45,14 @@ async function push(repo, release, updateLatest, registry, registryPath, stubReg
  await asyncUtils.forEach(definitionsToPush, async (currentDefinitionId) => {
  console.log(`**** Pushing ${currentDefinitionId} ${release} ****`);
  await pushImage(
- currentDefinitionId, repo, release, updateLatest, registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImages, vscodeRegistryPath);
+ currentDefinitionId, repo, release, updateLatest, registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImages, secondaryRegistryPath);
  });
 
  return stagingFolder;
 }
 
 async function pushImage(definitionId, repo, release, updateLatest,
- registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImage, vscodeRegistryPath) {
+ registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImage, secondaryRegistryPath) {
  const definitionPath = configUtils.getDefinitionPath(definitionId);
  const dotDevContainerPath = definitionPath;
  // Use Dockerfile for image build
@@ -94,11 +94,10 @@ async function pushImage(definitionId, repo, release, updateLatest,
  const imageName = imageNamesWithVersionTags[0].split(':')[0];
 
  // Dual publish image to devcontainers and vscode/devcontainers
- const vscodeImageNamesWithVersionTags = configUtils.getTagList(definitionId, release, updateLatest, registry, vscodeRegistryPath, variant);
- const vscodeImageName = vscodeImageNamesWithVersionTags[0].split(':')[0];
+ const secondaryImageNamesWithVersionTags = configUtils.getTagList(definitionId, release, updateLatest, registry, secondaryRegistryPath, variant);
 
  console.log(`(*) Tags:${imageNamesWithVersionTags.reduce((prev, current) => prev += `\n ${current}`, '')}`);
- console.log(`(*) VS Code Tags:${vscodeImageNamesWithVersionTags.reduce((prev, current) => prev += `\n ${current}`, '')}`);
+ console.log(`(*) Secondary Tags:${secondaryImageNamesWithVersionTags.reduce((prev, current) => prev += `\n ${current}`, '')}`);
 
  const buildSettings = configUtils.getBuildSettings(definitionId);
 
@@ -138,8 +137,8 @@ async function pushImage(definitionId, repo, release, updateLatest,
  const workingDir = path.resolve(dotDevContainerPath, context);
  let imageNameParams = imageNamesWithVersionTags.reduce((prev, current) => prev.concat(['--image-name', current]), []);
 
- const vscodeImageNameParams = vscodeImageNamesWithVersionTags.reduce((prev, current) => prev.concat(['--image-name', current]), []);
- imageNameParams = imageNameParams.concat(vscodeImageNameParams);
+ const secondaryImageNameParams = secondaryImageNamesWithVersionTags.reduce((prev, current) => prev.concat(['--image-name', current]), []);
+ imageNameParams = imageNameParams.concat(secondaryImageNameParams);
 
  const spawnOpts = { stdio: 'inherit', cwd: workingDir, shell: true };
  await asyncUtils.spawn('devcontainer', [

diff --git a/build/vscdc b/build/vscdc
@@ -82,9 +82,9 @@ require('yargs')
  type: 'array',
  default: []
  },
- 'vscode-registry-path': {
- describe: 'VS Code container registry path',
- default: configUtils.getConfig('vscodeContainerRegistryPath', '')
+ 'secondary-registry-path': {
+ describe: 'Secondary container registry path',
+ default: configUtils.getConfig('secondaryContainerRegistryPath', '')
  }
  })
  }, pushCommand)
@@ -244,7 +244,7 @@ require('yargs')
 
 function pushCommand(argv) {
  push(argv.githubRepo, argv.release, argv.updateLatest, argv.registry, argv.registryPath, argv.stubRegistry,
- argv.stubRegistryPath, argv.push, argv.prepOnly, argv.skip, argv.page, argv.pageTotal, argv.replaceImages, argv.devcontainer, argv.vscodeRegistryPath)
+ argv.stubRegistryPath, argv.push, argv.prepOnly, argv.skip, argv.page, argv.pageTotal, argv.replaceImages, argv.devcontainer, argv.secondaryRegistryPath)
  .catch((reason) => {
  console.error(`(!) Push failed - ${reason}`);
  if(reason.stack) {