Skip to content

Commit 1a265a2

Browse files
committed
Since for now we'll go for 25, it's handy if that builds first.
1 parent d8f0957 commit 1a265a2

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/docker-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
max-parallel: 1
2626
matrix:
2727
java:
28-
- '8u472-b08-jdk-noble'
2928
- '25.0.1_8-jdk-noble'
29+
- '8u472-b08-jdk-noble'
3030
directory:
3131
- env
3232
- build

tomcat/catalina_base/bin/setenv.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,9 @@ if [ -z "$JPDA_ADDRESS" ] ; then
9898
export JPDA_ADDRESS=*:8000
9999
fi
100100
fi
101-
102-
export JPDA_TRANSPORT=dt_socket
101+
if [ -z "$JPDA_TRANSPORT" ] ; then
102+
export JPDA_TRANSPORT=dt_socket
103+
fi
103104

104105

105106
# The complete container is dedicated to tomcat, so lets also use its tmp dir

0 commit comments

Comments
 (0)