From 8ca0b1650af8e3efa66ecc75035c5de17d67b717 Mon Sep 17 00:00:00 2001
From: Thijs Lemmens <thijs.lemmens@xenit.eu>
Date: Fri, 15 Sep 2023 09:49:26 +0200
Subject: [PATCH] XENFRED-4897 Switch to CloudSmith images, except for
 markdown2pdf which breaks the build

---
 .github/workflows/ci.yml | 8 +++++++-
 build-websites.sh        | 6 +++---
 repo/alfred-api/stable   | 2 +-
 repo/inflow/3.4          | 2 +-
 repo/inflow/3.5          | 2 +-
 repo/inflow/4.0          | 2 +-
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2795f50..1e3ca45 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,13 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 1.11
-      - name: Login to Docker
+      - name: Login to CloudSmith
+        uses: docker/login-action@v2
+        with:
+          registry: private.docker.xenit.eu
+          username: ${{ secrets.CLOUDSMITH_USER }}
+          password: ${{ secrets.CLOUDSMITH_APIKEY }}
+      - name: Login to hub.xenit.eu
         uses: docker/login-action@v2
         with:
           registry: hub.xenit.eu
diff --git a/build-websites.sh b/build-websites.sh
index cf68020..0f18b29 100755
--- a/build-websites.sh
+++ b/build-websites.sh
@@ -2,8 +2,8 @@
 set -e
 scriptPath="$( dirname "${BASH_SOURCE[0]}" )" # cd to the directory containg the script
 cd "$scriptPath"
+MARKDOWNTOWEBSITE_VERSION=1.0.2
 MARKDOWNTOPDF_VERSION=build-201911121900-1
-MARKDOWNTOWEBSITE_VERSION=1.0.0-SNAPSHOT-202010231216-2
 
 WEIGHT=0
 
@@ -44,7 +44,7 @@ split_manual() {
     WEIGHT=$[$WEIGHT + 1]
     mkdir -p "build/product/$productName"
     tar tf "build/normalized/$productName/$versionName.tar"
-    cat "build/normalized/$productName/$versionName.tar" | docker run --rm -i hub.xenit.eu/private/xenit-manuals-markdown-splitter:$MARKDOWNTOWEBSITE_VERSION normalized.md "target-path=$versionName" "weight=$WEIGHT" > "build/normalized/$productName/$versionName-out.tar"
+    cat "build/normalized/$productName/$versionName.tar" | docker run --rm -i private.docker.xenit.eu/customer/xenit/xenit-manuals-markdown-splitter:$MARKDOWNTOWEBSITE_VERSION normalized.md "target-path=$versionName" "weight=$WEIGHT" > "build/normalized/$productName/$versionName-out.tar"
     sync
     tar xf "build/normalized/$productName/$versionName-out.tar" -C "build/product/$productName"
 }
@@ -59,7 +59,7 @@ build_product_website() {
     mkdir -p "build/website/$productName"
     cp -r "docs/$productName/_hugo" "build/product/$productName/_hugo"
     tar c --portability -C "build/product/$productName" . | \
-        docker run --rm -i hub.xenit.eu/private/xenit-manuals-hugo-generator:$MARKDOWNTOWEBSITE_VERSION | \
+        docker run --rm -i private.docker.xenit.eu/customer/xenit/xenit-manuals-hugo-generator:$MARKDOWNTOWEBSITE_VERSION | \
         tar x -C "build/website/$productName"
     sync
 }
diff --git a/repo/alfred-api/stable b/repo/alfred-api/stable
index d68daec..cd78c8a 160000
--- a/repo/alfred-api/stable
+++ b/repo/alfred-api/stable
@@ -1 +1 @@
-Subproject commit d68daecdf0b6872c909e8585a3d3a750cb32924f
+Subproject commit cd78c8ac08a2f4009c10acb597a758833d79d47d
diff --git a/repo/inflow/3.4 b/repo/inflow/3.4
index 7605ce2..7d973b0 160000
--- a/repo/inflow/3.4
+++ b/repo/inflow/3.4
@@ -1 +1 @@
-Subproject commit 7605ce2f45f81e473fcf8072021123924cd2121c
+Subproject commit 7d973b0691228b60bbd27aaebea690582e648ec6
diff --git a/repo/inflow/3.5 b/repo/inflow/3.5
index 941723c..cbce169 160000
--- a/repo/inflow/3.5
+++ b/repo/inflow/3.5
@@ -1 +1 @@
-Subproject commit 941723cfc01ecee072a2706546c8d3e4e0a186a5
+Subproject commit cbce1698b9433b234f7e250aa79d06d8e010efd3
diff --git a/repo/inflow/4.0 b/repo/inflow/4.0
index 9c061c9..f12ef34 160000
--- a/repo/inflow/4.0
+++ b/repo/inflow/4.0
@@ -1 +1 @@
-Subproject commit 9c061c99383d61faa2de00a67d8850bed759083d
+Subproject commit f12ef3428f7a4a1e33f31e284e4ffd30b110b584