Tools: Added option to push Docker images to DockerHub or not

bablecopherye · Aug 14, 2021 · d27f3b6 · d27f3b6
1 parent 8063c94
commit d27f3b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/scripts/run_ci.sh b/.github/scripts/run_ci.sh
@@ -134,7 +134,7 @@ if [[ $GIT_TAG_NAME = v* ]]; then
 elif [[ $GIT_TAG_NAME = server-v* ]] && [[ $IS_LINUX = 1 ]]; then
  echo "Step: Building Docker Image..."
  cd "$ROOT_DIR"
- npm run buildServerDocker -- --tag-name $GIT_TAG_NAME
+ npm run buildServerDocker -- --tag-name $GIT_TAG_NAME --push-images
 else
  echo "Step: Building but *not* publishing desktop application..."
  USE_HARD_LINKS=false npm run dist -- --publish=never

diff --git a/packages/tools/buildServerDocker.ts b/packages/tools/buildServerDocker.ts
@@ -16,6 +16,7 @@ async function main() {
  const argv = require('yargs').argv;
  if (!argv.tagName) throw new Error('--tag-name not provided');
 
+ const pushImages = !!argv.pushImages;
  const tagName = argv.tagName;
  const isPreRelease = getIsPreRelease(tagName);
  const imageVersion = getVersionFromTag(tagName, isPreRelease);
@@ -38,14 +39,15 @@ async function main() {
  console.info(`Running from: ${process.cwd()}`);
 
  console.info('tagName:', tagName);
+ console.info('pushImages:', pushImages);
  console.info('imageVersion:', imageVersion);
  console.info('isPreRelease:', isPreRelease);
  console.info('Docker tags:', dockerTags.join(', '));
 
  await execCommand2(`docker build -t "joplin/server:${imageVersion}" ${buildArgs} -f Dockerfile.server .`);
  for (const tag of dockerTags) {
  await execCommand2(`docker tag "joplin/server:${imageVersion}" "joplin/server:${tag}"`);
- await execCommand2(`docker push joplin/server:${tag}`);
+ if (pushImages) await execCommand2(`docker push joplin/server:${tag}`);
  }
 }