Skip to content

Commit

Permalink
XENFRED-4897 Switch to CloudSmith images, except for markdown2pdf whi…
Browse files Browse the repository at this point in the history
…ch breaks the build
  • Loading branch information
thijslemmens committed Sep 15, 2023
1 parent 21414b6 commit 8ca0b16
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build-websites.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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"
}
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion repo/alfred-api/stable
Submodule stable updated 101 files
2 changes: 1 addition & 1 deletion repo/inflow/3.4
Submodule 3.4 updated from 7605ce to 7d973b
2 changes: 1 addition & 1 deletion repo/inflow/3.5
Submodule 3.5 updated from 941723 to cbce16
2 changes: 1 addition & 1 deletion repo/inflow/4.0
Submodule 4.0 updated from 9c061c to f12ef3

0 comments on commit 8ca0b16

Please sign in to comment.