From cad7df4868b833bd5bf900c7d8a27da19bf39053 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Fri, 9 Jun 2023 09:34:16 +0000
Subject: [PATCH] Update 2.2.x branch for respin (#379)

Update GH action to match master

Update known_hosts.sh with new SSH keys
---
 .github/workflows/main.yml   | 42 +++++++++++++++++++++++++++++-------
 docker-custom/known_hosts.sh |  4 +++-
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 407b66e7..5da00ae4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -4,6 +4,12 @@ name: Docker Build
 
 # Controls when the action will run. 
 on:
+  workflow_dispatch:
+    inputs:
+      version:
+        required: true
+        type: string
+        description: "Version"
   release: 
     types: [published]
 
@@ -66,20 +72,35 @@ jobs:
             fi
           done <<< "${{ steps.meta.outputs.tags }}"
 
-          TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
+          echo "Start Tags = $TAGS"
+          echo "GITHUB_REF= $GITHUB_REF"
+
+          echo "version = ${{ github.event.inputs.version }}"
+
+          if [[ ! -z "${{ github.event.inputs.version }}" ]]; then
+            TEMP=${{ github.event.inputs.version }}
+            TEMP=${TEMP:1}
+            TEMP2=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
+            echo "$GITHUB_REF - $TEMP"
+            TAGS=$(echo $TAGS | sed "s/$TEMP2/$TEMP/")
+            TRAVIS_TAG=${{ github.event.inputs.version }}
+          else
+            TRAVIS_TAG=$(echo $GITHUB_REF | awk -F '/' '{ print $3}')
+          fi
+          echo "TRAVIS_TAG = $TRAVIS_TAG"
+
           if [[ "$TRAVIS_TAG" =~ ^v[0-9\.-]*$ ]]; then
             IMAGE=${{ env.DEFAULT_IMAGE }}
             PUSH="true"
             VERSION=${TRAVIS_TAG:1}
+            STABLE_VERSION=`echo ${VERSION} | sed -r 's/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$/\1.\2/'`
 
             if [[ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" && "${{ matrix.suffix }}" == "" ]]; then
-              TAGS="$TAGS,$IMAGE:$VERSION"
+              TAGS="$TAGS,$IMAGE:$VERSION,$IMAGE:$STABLE_VERSION"
             elif [[ "${{ matrix.node }}" == "${{ env.LATEST_NODE }}" &&  "${{ matrix.suffix }}" == "-minimal" ]]; then
               TAGS="$TAGS,$IMAGE:$VERSION-minimal"
             fi
 
-            # TAGS="$TAGS,$IMAGE:latest-${{ matrix.node }}${{ matrix.suffix }}"
-
           else
             IMAGE=${{ env.DEV_IMAGE }}
             if [[ "$TRAVIS_TAG" == *"dev"*  || "$TRAVIS_TAG" == *"beta"* ]]; then
@@ -96,10 +117,15 @@ jobs:
 
           echo $TAGS
 
-          echo "::set-output name=tags::$TAGS"
-          echo "::set-output name=push::$PUSH"
-          echo "::set-output name=version::$(echo $GITHUB_REF | awk -F '/' '{ print $3}')"
-          echo "::set-output name=buildVersion::$VERSION"
+          # echo "::set-output name=tags::$TAGS"
+          # echo "::set-output name=push::$PUSH"
+          # echo "::set-output name=version::$(echo $GITHUB_REF | awk -F '/' '{ print $3}')"
+          # echo "::set-output name=buildVersion::$VERSION"
+
+          echo "tags=$TAGS" >> $GITHUB_OUTPUT
+          echo "push=$PUSH" >> $GITHUB_OUTPUT
+          echo "version=$TRAVIS_TAG" >> $GITHUB_OUTPUT
+          echo "buildVersion=$VERSION" >> $GITHUB_OUTPUT
       - 
         name: Login to DockerHub
         uses: docker/login-action@v1
diff --git a/docker-custom/known_hosts.sh b/docker-custom/known_hosts.sh
index bd0ccfd6..9ab173bb 100755
--- a/docker-custom/known_hosts.sh
+++ b/docker-custom/known_hosts.sh
@@ -45,15 +45,17 @@ ssh-keygen -l -f ${known_hosts_file} | sort > "$fingerprints"
 
 diff - "$fingerprints" <<EOF
 2048 SHA256:ROQFvPThGrW4RuWLoL9tq9I9zJ42fK4XywyRtbOz/EQ gitlab.com (RSA)
-2048 SHA256:nThbg6kXUpJWGl7E1IGOCspRomTxdCARLviKw6E5SY8 github.com (RSA)
 2048 SHA256:ohD8VZEXGWo6Ez8GSEJQ9WpafgLFsOfLOtGGQCQo6Og ssh.dev.azure.com (RSA)
 2048 SHA256:ohD8VZEXGWo6Ez8GSEJQ9WpafgLFsOfLOtGGQCQo6Og vs-ssh.visualstudio.com (RSA)
 2048 SHA256:zzXQOXSRBEiUtuE8AikJYKwbHaxvSc0ojez9YXaGp1A bitbucket.org (RSA)
 256 SHA256:+DiY3wvvV6TuJJhbpZisF/zLDA0zPMSvHdkr4UvCOqU github.com (ED25519)
 256 SHA256:AGvEpqYNMqsRNIviwyk4J4HM0lEylomDBKOWZsBn434 [source.developers.google.com]:2022 (ECDSA)
+256 SHA256:FC73VB6C4OQLSCrjEayhMp9UMxS97caD/Yyi2bhW/J0 bitbucket.org (ECDSA)
 256 SHA256:HbW3g8zUjNSksFbqTiUWPWg2Bq1x8xdGUrliXFzSnUw gitlab.com (ECDSA)
 256 SHA256:eUXGGm1YGsMAS7vkcx6JOJdOGHPem5gQp4taiCfCLB8 gitlab.com (ED25519)
 256 SHA256:p2QAMXNIC1TJYWeIOttrVc98/R1BUFWu3/LiyKgUfQM github.com (ECDSA)
+256 SHA256:ybgmFkzwOSotHTHLJgHO0QN8L0xErw6vd0VhFA9m3SM bitbucket.org (ED25519)
+3072 SHA256:uNiVztksCsDhcc0u9e8BujQXVUpKZIDTMczCvj3tD2s github.com (RSA)
 EOF
 
 }