Merge branch 'master' into bug5774

This commit is contained in:
Udo Wessels committed 2024-05-17 11:54:38 +02:00
commit b65745c4b3
4 files changed
+13 -5

No files matched your search

+9 -2
View File
@@ -13,12 +13,18 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Login to docker.sapsailing.com
- name: Login to docker.sapsailing.com for sapjvm8 image download
uses: docker/login-action@v3
with:
registry: docker.sapsailing.com
username: ${{ secrets.DOCKER_SAPSAILING_COM_USERNAME }}
password: ${{ secrets.DOCKER_SAPSAILING_COM_PASSWORD }}
- name: Login to ghcr.io to upload sailing-analytics image
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Copy a few files
shell: bash
run: |
@@ -37,7 +43,8 @@ jobs:
uses: docker/build-push-action@v5
with:
build-args: RELEASE=${{ env.RELEASE }}
tags: docker.sapsailing.com/test:${{ env.RELEASE }}
#tags: docker.sapsailing.com/test:${{ env.RELEASE }}
tags: ghcr.io/sap/sailing-analytics:${{ env.RELEASE }}
file: docker/Dockerfile
context: docker/
push: true
@@ -137,7 +137,8 @@ if [[ "$COPY_FILES" == "true" && -d "files" ]]; then
cd "files"
\cp -rL * / # copies all files accross, realising any symbolic links. The backslash escapes the alias cp -i.
systemctl daemon-reload
for unit in $(find etc/systemd/system -type f); do
for unit in etc/systemd/system/*; do
[[ -f "$unit" ]] || continue
systemctl reenable /"${unit}" # to recreate all the dependency links.
done
cd ..
+1 -1
View File
@@ -1,4 +1,4 @@
FROM sapmachine:17.0.10
FROM sapmachine:17.0.11
ARG RELEASE
LABEL maintainer=axel.uhl@sap.com
# Download and extract the release
@@ -1,4 +1,4 @@
FROM sapmachine:17.0.10
FROM sapmachine:17.0.11
LABEL maintainer=axel.uhl@sap.com
# Download and extract the release
WORKDIR /home/sailing