Merge branch 'main' into bug6148

+ branches: [main, docker-24, docker-25]

+ tags: ghcr.io/${{steps.ghcr.outputs.PACKAGE}}:${{ env.RELEASE }}${{ env.BRANCH == 'main' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-17' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-17', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-21' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-21', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-24' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-24', steps.ghcr.outputs.PACKAGE) || env.BRANCH == 'docker-25' && github.event.inputs.release == '' && format(',ghcr.io/{0}:latest-25', steps.ghcr.outputs.PACKAGE) || '' }}

+ file: ${{ env.BRANCH == 'docker-17' && 'docker/Dockerfile_sapsailing_on_sapmachine17' || env.BRANCH == 'docker-21' && 'docker/Dockerfile_sapsailing_on_sapmachine21' || env.BRANCH == 'docker-24' && 'docker/Dockerfile_sapsailing_on_sapmachine24' || env.BRANCH == 'docker-25' && 'docker/Dockerfile_sapsailing_on_sapmachine25' || 'docker/Dockerfile' }}

+name: Merge main branch into docker-25 after successful build

+on:

+ workflow_run:

+ workflows: [release]

+ types: [completed]

+ branches: [main]

+ workflow_dispatch: {}

+jobs:

+ merge-main-into-docker-25:

+ permissions:

+ contents: write

+ if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}

+ runs-on: ubuntu-latest

+ steps:

+ - name: Checkout

+ uses: actions/checkout@v4

+ with:

+ ref: docker-25

+ fetch-depth: 0 # fetch the whole thing to make sure the histories merge

+ - name: Merge main into docker-25

+ uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # v1.4.0

+ env:

+ GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

+ with:

+ type: now

+ from_branch: main

+ target_branch: docker-25

+ message: Auto-merging main into docker-25 after successful release build

+ github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

+ - name: Install JDK 25

+ java-version: '25'

+ mvn-toolchain-id: 'JavaSE-25'

+ if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-24' || github.ref == 'refs/heads/docker-25' || startsWith(github.ref, 'refs/heads/releases/') }}

+ if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-24' || github.ref == 'refs/heads/docker-25' || startsWith(github.ref, 'refs/heads/releases/') }}

+ if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-24' || github.ref == 'refs/heads/docker-25' || startsWith(github.ref, 'refs/heads/releases/') }}

+ if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-24' || github.ref == 'refs/heads/docker-25' || startsWith(github.ref, 'refs/heads/releases/') }}

+ if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/docker-24' || github.ref == 'refs/heads/docker-25' || startsWith(github.ref, 'refs/heads/releases/') }}

+FROM sapmachine:25.0.1

+# This Dockerfile assumes that the release to use is provided as

+# ${RELEASE}.tar.gz in the current Docker workspace. Use, e.g.,

+# the configuration/github-download-release-assets.sh script to

+# obtain the tar.gz file for a specific or the latest "main" release.

+ARG RELEASE

+LABEL maintainer=axel.uhl@sap.com

+LABEL org.opencontainers.image.description="Sailing Analytics with Java 25"

+# Download and extract the release

+WORKDIR /home/sailing/servers/server

+RUN apt-get update \

+ && apt-get install -y wget apt-utils vim telnet dnsutils net-tools jq

+COPY vimrc /root/.vimrc

+RUN wget -O /tmp/rds.pem https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \

+ && ${JAVA_HOME}/bin/keytool -importcert -alias AWSRDS -file /tmp/rds.pem -keystore ${JAVA_HOME}/lib/security/cacerts -noprompt -storepass changeit \

+ && rm /tmp/rds.pem

+COPY ${RELEASE}.tar.gz /tmp

+RUN tar xzvpf /tmp/${RELEASE}.tar.gz \

+ && rm /tmp/${RELEASE}.tar.gz

+COPY env.sh .

+RUN cat env-default-rules.sh >>env.sh

+COPY start .

+COPY JavaSE-11.profile .

+EXPOSE 8888 14888 8000 7091 6666

+CMD [ "/home/sailing/servers/server/start", "docker" ]

+FROM sapmachine:25.0.1

+LABEL maintainer=axel.uhl@sap.com

+# Download and extract the release

+WORKDIR /home/sailing

+RUN chmod 777 /home/sailing; mkdir logs; mkdir dump

+RUN apt-get -y update; apt-get -y upgrade; apt-get -y install apt-utils wget curl

+RUN curl -fsSL https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add -

+RUN echo "deb [arch=amd64,arm64] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" >/etc/apt/sources.list.d/mongodb-org-4.4.list

+RUN apt-get update \

+ && apt-get install -y vim mongodb-org-shell

+COPY vimrc /root/.vimrc

+RUN wget -O /tmp/rds.pem https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \

+ && ${JAVA_HOME}/bin/keytool -importcert -alias AWSRDS -file /tmp/rds.pem -keystore ${JAVA_HOME}/lib/security/cacerts -noprompt -storepass changeit \

+ && rm /tmp/rds.pem

+RUN wget -O /home/sailing/WindEstimationModelsTraining.jar https://static.sapsailing.com/WindEstimationModelsTraining.jar

+CMD exec java "${MEMORY}" -Dmongo.uri="${MONGODB_URI}" -XX:+UseParallelGC -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=dump/ -Xlog:gc*=info,gc+region*=info,gc+ergo*=info,gc+humongous*=info,gc+liveness=trace:file=logs/gc.log:time,level,tags:filecount=10,filesize=100000000 -jar WindEstimationModelsTraining.jar "${BEARER_TOKEN}" ${TRAINING_DATA_PERCENT}

+version: "3.10"

+services:

+ sailing-analytics:

+ image: "ghcr.io/sap/sailing-analytics:latest-25"

+ ports:

+ - "8888:8888"

+ - "6666:6666"

+ - "14888:14888"

+ environment:

+ MONGODB_URI: mongodb://mongo/test

+ SERVER_NAME: test

+ REPLICATION_HOST: rabbitmq

+ REPLICATION_CHANNEL: test

+ REPLICATION_PORT: 5672

+ mongo:

+ image: "mongo:7"

+ rabbitmq:

+ image: "rabbitmq:3.13"

+

+#!/bin/bash

+release_prefix=$1

+GITROOT="`dirname $0`/.."

+DOCKERDIR="${GITROOT}/docker"

+DOCKERFILE="$DOCKERDIR/Dockerfile"

+if [ "${release_prefix}" = "" ]; then

+ SET_LATEST=1

+ release_prefix="docker-25-"

+fi

+pushd "${DOCKERDIR}"

+RELEASE_TAR_GZ_FILENAME=$( ${GITROOT}/configuration/github-download-release-assets.sh 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 "${release_prefix}" )

+if [ "${RELEASE_TAR_GZ_FILENAME}" = "" ]; then

+ echo "No release with prefix ${release_prefix} found" >&2

+else

+ release=$( echo ${RELEASE_TAR_GZ_FILENAME} | sed -e 's/\.tar\.gz//' )

+ echo Release is ${release}

+ echo "Copying files from GITROOT $GITROOT into Docker workspace"

+ cp "$GITROOT/java/target/env.sh" "$DOCKERDIR"

+ cp "$GITROOT/java/target/start" "$DOCKERDIR"

+ cp "$GITROOT/java/target/configuration/JavaSE-11.profile" "$DOCKERDIR"

+ cd "$DOCKERDIR"

+ docker build --build-arg RELEASE=${release} -t ghcr.io/sap/sailing-analytics:${release} -f Dockerfile_sapsailing_on_sapmachine25 .

+ echo "Cleaning up..."

+ rm start env.sh JavaSE-11.profile ${RELEASE_TAR_GZ_FILENAME} release-notes.txt

+ docker push ghcr.io/sap/sailing-analytics:${release}

+ if [ "$SET_LATEST" = "1" ]; then

+ docker tag ghcr.io/sap/sailing-analytics:${release} ghcr.io/sap/sailing-analytics:latest-25

+ docker push ghcr.io/sap/sailing-analytics:latest-25

+ fi

+fi

+popd

+/**

+ * Mobile footer styling

+ */

+ float: right;

+/**

+ * Desktop footer styling

+ */

+.dfooter {

+ background: SITEFOOTER_BACKGROUND_COLOR;

+ color: SITEFOOTER_TEXT_COLOR;

+ font-size: 1rem;

+ border-top: 0.333333333333333em solid SITEFOOTER_BACKGROUND_COLOR;

+ padding: 0 1.333333333333333em;

+ margin-top: -5.333333333333333em;

+ display: block;

+ line-height: normal;

+ width: 100%;

+ position: relative;

+ z-index: 1000;

+}

+.dfooter_row {

+ display: flex;

+ flex-wrap: wrap;

+ align-items: center;

+ min-height: 5em;

+ row-gap: 0.25em;

+ column-gap: 2em;

+}

+.dfooter_left {

+ display: flex;

+ flex-wrap: wrap;

+ align-items: baseline;

+ /*change rem here to configure preferred width before right block drops */

+ flex: 1 1 14rem;

+ row-gap: 0.25em;

+ column-gap: 2em;

+ min-width: 0;

+}

+.dfooter_right {

+ display: flex;

+ align-items: center;

+ margin-left: auto;

+ flex: 0 0 auto;

+ min-width: 8rem;

+}

+.dfooter_item,

+.dfooter_link,

+.dfooter_copyright {

+ line-height: 1;

+ margin: 0;

+ padding: 0;

+ display: inline-flex;

+ align-items: center;

+}

+.dfooter_copyright {

+ font-weight: 600;

+ white-space: nowrap;

+ color: SITEFOOTER_TEXT_COLOR;

+}

+.dfooter_link {

+ text-decoration: none;

+ color: SITEFOOTER_TEXT_COLOR;

+}

+.dfooter_link:hover,

+.dfooter_link:focus { text-decoration: underline; }

+.dfooter_language { text-align: right; white-space: nowrap; }

+.dfooter_language select {

+ background-color: SITEFOOTER_BACKGROUND_COLOR;

+ color: SITEFOOTER_TEXT_COLOR;

+ max-width: 100%;

+}

+ @UiField AnchorElement sapJobsAnchor;

+ sapJobsAnchor.getStyle().setDisplay(Display.NONE);

+ <g:HTMLPanel tag="footer" addStyleNames="{local_res.css.dfooter}">

+ <div class="{res.mediaCss.grid} {local_res.css.dfooter_row}">

+ <div class="{local_res.css.dfooter_left}">

+ <div ui:field="copyrightDiv" class="{local_res.css.dfooter_item} {local_res.css.dfooter_copyright}">

+ </div>

+ <a ui:field="imprintAnchorLink" target="_blank" class="{local_res.css.dfooter_item} {local_res.css.dfooter_link}">

+ <a ui:field="privacyAnchorLink" href="https://www.sap.com/about/legal/privacy.html?campaigncode=CRM-XH21-OSP-Sailing" target="_blank" class="{local_res.css.dfooter_item} {local_res.css.dfooter_link}">

+ <a ui:field="sapJobsAnchor" href="https://jobs.sapsailing.com" target="_blank" class="{local_res.css.dfooter_item} {local_res.css.dfooter_link}">

+ <a ui:field="supportAnchor" href="https://support.sapsailing.com" target="_blank" class="{local_res.css.dfooter_item} {local_res.css.dfooter_link}">

+ <a ui:field="whatsNewAnchor" href="{releaseNotesNavigation.getSafeTargetUrl}" class="{local_res.css.dfooter_item} {local_res.css.dfooter_link}">

+ <ui:text from='{i18n.whatsNew}' />

+ </a>

+ class="{local_res.css.dfooter_item} {local_res.css.dfooter_link} {res.mediaCss.showonsmall} {res.mediaCss.hideonmedium} {res.mediaCss.hideonlarge}">

+ <div class="{local_res.css.dfooter_right}">

+ <l:LanguageSelector ui:field="languageSelector" labelText="{i18n.footerLanguage}" addStyleNames="{local_res.css.dfooter_language}" />

+ </div>

+ String dfooter();

+ String dfooter_row();

+ String dfooter_left();

+ String dfooter_right();

+ String dfooter_item();

+ String dfooter_copyright();

+ String dfooter_link();

+ String dfooter_language();

+import com.google.gwt.dom.client.SpanElement;

+ @UiField AnchorElement sapJobsAnchor;

+ @UiField AnchorElement privacyAnchor;

+ @UiField SpanElement pipe;

+ sapJobsAnchor.getStyle().setDisplay(Display.NONE);

+ privacyAnchor.getStyle().setDisplay(Display.NONE);

+ } else {

+ pipe.setInnerText("|");

+ <div ui:field="copyrightDiv" class="{res.mediaCss.small12} {res.mediaCss.columns} {local_res.css.sitefooter_copyright}">

+ <ui:text from='{i18n.footerCopyright}' />

+ </div>

+ <a ui:field="privacyAnchor" href="https://www.sap.com/about/legal/privacy.html?campaigncode=CRM-XH21-OSP-Sailing"

+ <span ui:field="pipe"></span>

+ <a ui:field="desktopUi" title="{i18n.desktop}" href="">

+ <ui:text from='{i18n.desktop}' />

+ </a>

+ <l:LanguageSelector ui:field="languageSelector" labelText="{i18n.footerLanguage}"

+ addStyleNames="{local_res.css.sitefooter_language} {res.mediaCss.small12} {res.mediaCss.columns}"/>

+exportTWAHistogramToCsv=Export histogramu úhlu skutečného větru do CSV

+exportWindSpeedHistogramToCsv=Export histogramu rychlosti větru do CSV

+optionalBearerTokenForWindImport=Volitelný nosný token pro import větru

+exportTWAHistogramToCsv=Eksporter histogram for sand vindvinkel til CSV

+exportWindSpeedHistogramToCsv=Eksporter histogram for vindhastighed til CSV

+optionalBearerTokenForWindImport=Valgfrit ihændehavertoken til vindimport

+exportTWAHistogramToCsv=Exportar histograma de ángulos de viento reales a CSV

+exportWindSpeedHistogramToCsv=Exportar histograma de velocidades de viento a CSV

+optionalBearerTokenForWindImport=Token de portador opcional para importación de viento

+exportTWAHistogramToCsv=Exporter l''histogramme de l''angle du vent réel au format CSV

+exportWindSpeedHistogramToCsv=Exporter l''histogramme de la vitesse du vent au format CSV

+optionalBearerTokenForWindImport=Jeton porteur facultatif pour l''importation des données de vent

+exportTWAHistogramToCsv=Esporta istogramma angolo del vento reale in CSV

+exportWindSpeedHistogramToCsv=Esporta istogramma velocità del vento in CSV

+optionalBearerTokenForWindImport=Bearer token facoltativo per l’importazione vento

+exportTWAHistogramToCsv=真風角度ヒストグラムの CSV へのエクスポート

+exportWindSpeedHistogramToCsv=風速ヒストグラムの CSV へのエクスポート

+optionalBearerTokenForWindImport=風インポートの任意ベアラートークン

+exportTWAHistogramToCsv=Exportar histograma do ângulo do vento verdadeiro para CSV

+exportWindSpeedHistogramToCsv=Exportar histograma da velocidade do vento para CSV

+optionalBearerTokenForWindImport=Token de portador opcional para importação do vento

+exportTWAHistogramToCsv=Экспортировать гистограмму угла истинного ветра в CSV

+exportWindSpeedHistogramToCsv=Экспортировать гистограмму скорости ветра в CSV

+optionalBearerTokenForWindImport=Опциональный маркер носителя для импорта ветра

+exportTWAHistogramToCsv=Izvoz histograma kota pravega vetra v CSV

+exportWindSpeedHistogramToCsv=Izvoz histograma hitrosti vetra v CSV

+optionalBearerTokenForWindImport=Neobvezni nosilni žeton za uvoz vetra

+exportTWAHistogramToCsv=将实际风向角直方图导出到 CSV

+exportWindSpeedHistogramToCsv=将风速直方图导出到 CSV

+optionalBearerTokenForWindImport=用于风力数据导入的可选持有者令牌