From a6cc04d582e142f02c4dd9c9957b5a54c16fc39b Mon Sep 17 00:00:00 2001 From: Victor Lin <13424970+victorlin@users.noreply.github.com> Date: Thu, 22 Dec 2022 13:10:34 -0500 Subject: [PATCH] fixup! update push/pull scripts to reflect 3-stage build --- devel/delete-from-ghcr.js | 6 +++++- devel/pull-from-registry | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/devel/delete-from-ghcr.js b/devel/delete-from-ghcr.js index 479fe172..e26b5032 100644 --- a/devel/delete-from-ghcr.js +++ b/devel/delete-from-ghcr.js @@ -8,7 +8,11 @@ module.exports = async ({octokit, tag}) => { org = 'nextstrain'; - packages = ['base', 'base-builder']; + packages = [ + 'base', + 'base-native-builder', + 'base-emulated-builder', + ]; // Try all packages before terminating with any errors. let errorEncountered = false; diff --git a/devel/pull-from-registry b/devel/pull-from-registry index 4a6a0fe0..1bd1106c 100755 --- a/devel/pull-from-registry +++ b/devel/pull-from-registry @@ -17,8 +17,10 @@ while getopts "r:t:" opt; do esac done -BUILDER_IMAGE=nextstrain/base-builder +NATIVE_BUILDER_IMAGE=nextstrain/base-native-builder +EMULATED_BUILDER_IMAGE=nextstrain/base-emulated-builder FINAL_IMAGE=nextstrain/base -docker pull "$registry/$BUILDER_IMAGE:$tag" +docker pull "$registry/$NATIVE_BUILDER_IMAGE:$tag" +docker pull "$registry/$EMULATED_BUILDER_IMAGE:$tag" docker pull "$registry/$FINAL_IMAGE:$tag"