Skip to content

Commit 01513f7

Browse files
samruddhikhandalesamruddhikhandale
committed
rename to secondary
1 parent 55c385b commit 01513f7

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

‎.github/workflows/push-again.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
5454
STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
5555
STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
56-
VSCODE_REGISTRY_BASE_PATH: ${{ secrets.VSCODE_REGISTRY_BASE_PATH }}
56+
SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
5757
run: |
5858
set -e
5959
@@ -78,5 +78,5 @@ jobs:
7878
--registry-path "$REGISTRY_BASE_PATH" \
7979
--stub-registry "$STUB_REGISTRY" \
8080
--stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
81-
--vscode-registry-path "$VSCODE_REGISTRY_BASE_PATH" \
81+
--secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH" \
8282
${{ github.event.inputs.image }}

‎.github/workflows/push-dev.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
4444
STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
4545
STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
46-
VSCODE_REGISTRY_BASE_PATH: ${{ secrets.VSCODE_REGISTRY_BASE_PATH }}
46+
SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
4747
run: |
4848
set -e
4949
@@ -66,7 +66,7 @@ jobs:
6666
--registry-path "$REGISTRY_BASE_PATH" \
6767
--stub-registry "$STUB_REGISTRY" \
6868
--stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
69-
--vscode-registry-path "$VSCODE_REGISTRY_BASE_PATH"
69+
--secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH"
7070
7171
image-info:
7272
name: Trigger info extraction

‎.github/workflows/push.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
REGISTRY_BASE_PATH: ${{ secrets.REGISTRY_BASE_PATH }}
4848
STUB_REGISTRY: ${{ secrets.STUB_REGISTRY }}
4949
STUB_REGISTRY_BASE_PATH: ${{ secrets.STUB_REGISTRY_BASE_PATH }}
50-
VSCODE_REGISTRY_BASE_PATH: ${{ secrets.VSCODE_REGISTRY_BASE_PATH }}
50+
SECONDARY_REGISTRY_BASE_PATH: ${{ secrets.SECONDARY_REGISTRY_BASE_PATH }}
5151
run: |
5252
set -e
5353
@@ -66,7 +66,7 @@ jobs:
6666
--registry-path "$REGISTRY_BASE_PATH" \
6767
--stub-registry "$STUB_REGISTRY" \
6868
--stub-registry-path "$STUB_REGISTRY_BASE_PATH" \
69-
--vscode-registry-path "$VSCODE_REGISTRY_BASE_PATH"
69+
--secondary-registry-path "$SECONDARY_REGISTRY_BASE_PATH"
7070
7171
image-info:
7272
name: Trigger info extraction

‎build/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Once you have your build configuration setup, you can use the `vscdc` CLI to tes
4646
1. First, build the image(s) using the CLI as follows:
4747

4848
```bash
49-
build/vscdc push --no-push --registry mcr.microsoft.com --registry-path devcontainers --release main <your-image-name-here>
49+
build/vscdc push --no-push --registry mcr.microsoft.com --registry-path devcontainers --release main <your-image-name-here>VS Code Tags
5050
```
5151

5252
2. Use the Docker CLI to verify all of the expected images and tags and have the right contents:

‎build/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"containerRegistry": "devcon.azurecr.io",
33
"containerRegistryPath": "public/devcontainers",
4-
"vscodeContainerRegistryPath": "public/vscode/devcontainers",
4+
"secondaryContainerRegistryPath": "public/vscode/devcontainers",
55
"stubRegistry": "mcr.microsoft.com",
66
"stubRegistryPath": "devcontainers",
77
"githubRepoName": "devcontainers/images",

‎build/src/push.js‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const prep = require('./prep');
1111
const builderName = 'dev-containers-builder';
1212

1313
async function push(repo, release, updateLatest, registry, registryPath, stubRegistry,
14-
stubRegistryPath, pushImages, prepOnly, definitionsToSkip, page, pageTotal, replaceImages, definitionId, vscodeRegistryPath) {
14+
stubRegistryPath, pushImages, prepOnly, definitionsToSkip, page, pageTotal, replaceImages, definitionId, secondaryRegistryPath) {
1515

1616
// Optional argument defaults
1717
prepOnly = typeof prepOnly === 'undefined' ? false : prepOnly;
@@ -45,14 +45,14 @@ async function push(repo, release, updateLatest, registry, registryPath, stubReg
4545
await asyncUtils.forEach(definitionsToPush, async (currentDefinitionId) => {
4646
console.log(`**** Pushing ${currentDefinitionId} ${release} ****`);
4747
await pushImage(
48-
currentDefinitionId, repo, release, updateLatest, registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImages, vscodeRegistryPath);
48+
currentDefinitionId, repo, release, updateLatest, registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImages, secondaryRegistryPath);
4949
});
5050

5151
return stagingFolder;
5252
}
5353

5454
async function pushImage(definitionId, repo, release, updateLatest,
55-
registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImage, vscodeRegistryPath) {
55+
registry, registryPath, stubRegistry, stubRegistryPath, prepOnly, pushImages, replaceImage, secondaryRegistryPath) {
5656
const definitionPath = configUtils.getDefinitionPath(definitionId);
5757
const dotDevContainerPath = definitionPath;
5858
// Use Dockerfile for image build
@@ -94,11 +94,10 @@ async function pushImage(definitionId, repo, release, updateLatest,
9494
const imageName = imageNamesWithVersionTags[0].split(':')[0];
9595

9696
// Dual publish image to devcontainers and vscode/devcontainers
97-
const vscodeImageNamesWithVersionTags = configUtils.getTagList(definitionId, release, updateLatest, registry, vscodeRegistryPath, variant);
98-
const vscodeImageName = vscodeImageNamesWithVersionTags[0].split(':')[0];
97+
const secondaryImageNamesWithVersionTags = configUtils.getTagList(definitionId, release, updateLatest, registry, secondaryRegistryPath, variant);
9998

10099
console.log(`(*) Tags:${imageNamesWithVersionTags.reduce((prev, current) => prev += `\n ${current}`, '')}`);
101-
console.log(`(*) VS Code Tags:${vscodeImageNamesWithVersionTags.reduce((prev, current) => prev += `\n ${current}`, '')}`);
100+
console.log(`(*) Secondary Tags:${secondaryImageNamesWithVersionTags.reduce((prev, current) => prev += `\n ${current}`, '')}`);
102101

103102
const buildSettings = configUtils.getBuildSettings(definitionId);
104103

@@ -138,8 +137,8 @@ async function pushImage(definitionId, repo, release, updateLatest,
138137
const workingDir = path.resolve(dotDevContainerPath, context);
139138
let imageNameParams = imageNamesWithVersionTags.reduce((prev, current) => prev.concat(['--image-name', current]), []);
140139

141-
const vscodeImageNameParams = vscodeImageNamesWithVersionTags.reduce((prev, current) => prev.concat(['--image-name', current]), []);
142-
imageNameParams = imageNameParams.concat(vscodeImageNameParams);
140+
const secondaryImageNameParams = secondaryImageNamesWithVersionTags.reduce((prev, current) => prev.concat(['--image-name', current]), []);
141+
imageNameParams = imageNameParams.concat(secondaryImageNameParams);
143142

144143
const spawnOpts = { stdio: 'inherit', cwd: workingDir, shell: true };
145144
await asyncUtils.spawn('devcontainer', [

‎build/vscdc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ require('yargs')
8282
type: 'array',
8383
default: []
8484
},
85-
'vscode-registry-path': {
86-
describe: 'VS Code container registry path',
87-
default: configUtils.getConfig('vscodeContainerRegistryPath', '')
85+
'secondary-registry-path': {
86+
describe: 'Secondary container registry path',
87+
default: configUtils.getConfig('secondaryContainerRegistryPath', '')
8888
}
8989
})
9090
}, pushCommand)
@@ -244,7 +244,7 @@ require('yargs')
244244

245245
function pushCommand(argv) {
246246
push(argv.githubRepo, argv.release, argv.updateLatest, argv.registry, argv.registryPath, argv.stubRegistry,
247-
argv.stubRegistryPath, argv.push, argv.prepOnly, argv.skip, argv.page, argv.pageTotal, argv.replaceImages, argv.devcontainer, argv.vscodeRegistryPath)
247+
argv.stubRegistryPath, argv.push, argv.prepOnly, argv.skip, argv.page, argv.pageTotal, argv.replaceImages, argv.devcontainer, argv.secondaryRegistryPath)
248248
.catch((reason) => {
249249
console.error(`(!) Push failed - ${reason}`);
250250
if(reason.stack) {

0 commit comments

Comments
 (0)