Merge branch 'master' into develop

* master:
  refactor docker/composumlauncher starter scripts
  fix docker build
  rename profile github to more specific github-www-composum-com since it's for that specific maven repository ; debugging for docker build

.github/settings-istrepo.xml

@@ -25,6 +25,11 @@
           <username>${env.GITHUB_ACTOR}</username>
           <password>${env.GITHUB_TOKEN}</password>
         </server>
+        <server>
+          <id>github-www-composum-com</id>
+          <username>${env.GITHUB_ACTOR}</username>
+          <password>${env.GITHUB_TOKEN}</password>
+        </server>
         <server>
           <id>ossrh</id>
             <username>${env.OSSRH_USER}</username>
@@ -46,7 +51,7 @@
         <mirror>
             <id>istrepo</id>
             <name>istrepo</name>
-            <mirrorOf>*,!github-www-composum-com,!github</mirrorOf>
+            <mirrorOf>central</mirrorOf>
             <url>https://repo.ist-software.com/repository/maven-public</url>
         </mirror>
         <!-- -->

.github/workflows/dockerdeploy.yml

@@ -77,11 +77,13 @@ jobs:
         env:
           DOCKERHUB_USER: composum
           DOCKERHUB_PASSWD: ${{ secrets.DOCKERHUB_PASSWD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_ACTOR: ${{ github.actor }}
         # We don't do docker pushes as we don't currently (as of 4/22) have an automatic solution for multi architecture builds
         # Compare also https://github.com/actions/virtual-environments/issues/2187 (M1 support for github actions)
         run: |
           cd docker
-          $MVNCMD -P $(git branch --show-current),allplatforms deploy
+          $MVNCMD -P $(git branch --show-current),allplatforms,github-www-composum-com deploy
 
       - name: Check docker status
         run: |

docker/composumlauncher/start-current-from-dockerhub.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
-echo Start script for quick check of docker image drawn from dockerhub
-echo Debug / view logfiles with docker exec -it composum bash
-set -x
 source .env
-docker pull composum/featurelauncher-composum:$DOCKER_IMAGE_TAG
-docker run --name composum --rm -p 8080:8080 -e OPENAI_API_KEY=$OPENAI_API_KEY composum/featurelauncher-composum:$DOCKER_IMAGE_TAG
+#!/usr/bin/env bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+exec $DIR/start-version-from-dockerhub.sh $DOCKER_IMAGE_TAG

docker/composumlauncher/start-develop-from-dockerhub.sh

@@ -1,6 +1,3 @@
 #!/usr/bin/env bash
-echo Start script for quick check of docker image drawn from dockerhub
-echo Debug / view logfiles with docker exec -it composum bash
-set -x
-docker pull composum/featurelauncher-composum:develop
-docker run --name composum --rm -p 8080:8080 -e OPENAI_API_KEY=$OPENAI_API_KEY composum/featurelauncher-composum:develop
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+exec $DIR/start-version-from-dockerhub.sh develop

docker/composumlauncher/start-latest-from-dockerhub.sh

@@ -1,6 +1,3 @@
 #!/usr/bin/env bash
-echo Start script for quick check of docker image drawn from dockerhub
-echo Debug / view logfiles with docker exec -it composum bash
-set -x
-docker pull composum/featurelauncher-composum:latest
-docker run --name composum --rm -p 8080:8080 -e OPENAI_API_KEY=$OPENAI_API_KEY composum/featurelauncher-composum:latest
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+exec $DIR/start-version-from-dockerhub.sh latest

docker/composumlauncher/start-version-from-dockerhub.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+echo Start script for quick check of docker image drawn from dockerhub with the given version tag $1
+echo Debug / view logfiles with docker exec -it composum bash
+
+VERSION=$1
+if [ -z "$VERSION" ]
+then
+  echo "No version tag given, aborting"
+  exit 1
+fi
+
+set -x
+docker pull composum/featurelauncher-composum:$VERSION
+docker run --name composum --rm -p 8080:8080 -e OPENAI_API_KEY=$OPENAI_API_KEY composum/featurelauncher-composum:$VERSION

pom.xml

@@ -240,7 +240,7 @@
 			</activation>
 			<repositories>
 				<repository>
-					<id>github</id>
+					<id>github-www-composum-com</id>
 					<url>https://maven.pkg.github.com/ist-dresden/www-composum-com</url>
 					<snapshots>
 						<enabled>true</enabled>