README.md
... ...
@@ -32,11 +32,11 @@ Based on the ``docker/docker-compose.yml`` definition you should end up with thr
32 32
33 33
Try a request to [``http://127.0.0.1:8888/index.html``](http://127.0.0.1:8888/index.html) or [``http://127.0.0.1:8888/gwt/status``](http://127.0.0.1:8888/gwt/status) to see if things worked.
34 34
35
-To use Java 24, use the ``docker-compose-24.yml`` file instead:
35
+To use Java 25, use the ``docker-compose-25.yml`` file instead:
36 36
37 37
```
38 38
cd docker
39
- docker-compose -f docker-compose-24.yml up
39
+ docker-compose -f docker-compose-25.yml up
40 40
```
41 41
42 42
## Requirements
... ...
@@ -74,7 +74,7 @@ See [here](https://www.sapsailing.com/gwt/Home.html#/imprint/:) for a list of co
74 74
75 75
## Building and Running
76 76
77
-Builds usually run on [GitHub Actions](https://github.com/SAP/sailing-analytics/actions/workflows/release.yml) upon every push. A few repository secrets ensure that the build process has the permissions it needs. Pushes to the ``main``, ``docker-24`` and ``releases/*`` branches also publish a [release](https://github.com/SAP/sailing-analytics/releases) after a successful build.
77
+Builds usually run on [GitHub Actions](https://github.com/SAP/sailing-analytics/actions/workflows/release.yml) upon every push. A few repository secrets ensure that the build process has the permissions it needs. Pushes to the ``main``, ``docker-25`` and ``releases/*`` branches also publish a [release](https://github.com/SAP/sailing-analytics/releases) after a successful build.
78 78
79 79
There are two options for building, detailed below; for both, you need to fulfill a few prerequisites.
80 80
... ...
@@ -164,13 +164,13 @@ Then, manually trigger the ``release`` workflow with default options. You find t
164 164
165 165
Release builds will trigger the ``create-docker-image`` workflow which will produce a Docker image of your release and publish it as a "ghcr" package in your repository. Note that package names are computed from the repository name by converting the latter to all lowercase characters. If you want to use your packages in the docker-compose configurations from the ``docker/`` folder, make sure to adjust the package name so it points to your own fork's package registry.
166 166
167
-If you want automatic validation of your changes to the ``main`` branch also for newer Java versions, you can use the ``merge-main-into-docker-24`` workflow. It requires another secret:
167
+If you want automatic validation of your changes to the ``main`` branch also for newer Java versions, you can use the ``merge-main-into-docker-25`` workflow. It requires another secret:
168 168
169 169
```
170 170
REPO_TOKEN_FOR_MERGE_AND_PUSH: {a-GitHub-token-enabled-for-push}
171 171
```
172 172
173
-The workflow will launch automatically after a release has been performed for the ``main`` branch and will try to merge the latest ``main`` branch into ``docker-24`` and pushing the merge result if the merge was successful. This will then trigger a build for the ``docker-24`` branch which, if successul, will in turn produce a release and a docker image for use with Java 24.
173
+The workflow will launch automatically after a release has been performed for the ``main`` branch and will try to merge the latest ``main`` branch into ``docker-25`` and pushing the merge result if the merge was successful. This will then trigger a build for the ``docker-25`` branch which, if successul, will in turn produce a release and a docker image for use with Java 24.
174 174
175 175
### Run a build locally
176 176