Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10791 from jetty/fix/10.0.x/jetty-sh-updates 

Updates to jetty.sh and testing to reduce failures
This commit is contained in:
Joakim Erdfelt 2023-10-25 22:31:29 -05:00 committed by GitHub
parent 92f62a10f9 31b5518fe3
commit e98c0ae05d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-home/src/main/resources/bin/jetty.sh
View File

@ -635,13 +635,13 @@ case "$ACTION" in
chown "$JETTY_USER" "$JETTY_PID"
su - "$JETTY_USER" $SU_SHELL -c "
cd \"$JETTY_BASE\"
echo ${RUN_ARGS[*]} --start-log-file=\"$JETTY_START_LOG\" | xargs ${JAVA} > /dev/null &
echo ${RUN_ARGS[*]} | xargs ${JAVA} > /dev/null &
PID=\$!
disown \$PID"
(( DEBUG )) && echo "Starting: su shell (w/user $JETTY_USER) on PID $PID"
else
# Startup if not switching users
echo ${RUN_ARGS[*]} --start-log-file="${JETTY_START_LOG}" | xargs ${JAVA} > /dev/null &
echo ${RUN_ARGS[*]} | xargs ${JAVA} > /dev/null &
PID=$!
disown $PID
(( DEBUG )) && echo "Starting: java command on PID $PID"

2
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/jettysh/ImageOSAmazonCorretto11.java
View File

@ -24,7 +24,7 @@ public class ImageOSAmazonCorretto11 extends ImageOS
{
public ImageOSAmazonCorretto11()
{
super("amazoncorretto-jdk11",
super("amazoncorretto-jdk11-jetty10",
builder ->
builder
.from("amazoncorretto:11.0.20")

2
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/jettysh/ImageOSUbuntuJammyJDK17.java
View File

@ -22,7 +22,7 @@ public class ImageOSUbuntuJammyJDK17 extends ImageOS
{
public ImageOSUbuntuJammyJDK17()
{
super("ubuntu-22.04-jdk17",
super("ubuntu-22.04-jdk17-jetty10",
builder ->
builder
.from("ubuntu:22.04")

2
tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/jettysh/ImageUserChange.java
View File

@ -31,7 +31,7 @@ public class ImageUserChange extends ImageFromDSL
"useradd --home-dir=${JETTY_BASE} --shell=/bin/bash jetty ; " +
"chown jetty:jetty ${JETTY_BASE} ; " +
"chmod a+w ${JETTY_BASE} ; " +
"echo \"JETTY_USER=jetty\" > /etc/default/jetty") // user change
"echo \"JETTY_USER=jetty\" >> /etc/default/jetty") // user change
.user("jetty")
// Configure Jetty Base
.workDir("${JETTY_BASE}")