Skip to content

BREAKING: Remove deprecated graal setting and cp command for version file #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-stuartm merged 1 commit into from
Apr 9, 2025
Merged

BREAKING: Remove deprecated graal setting and cp command for version file #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions install-labkey.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,10 +980,8 @@ function step_configure_labkey() {
# copy jar file to LABKEY_INSTALL_HOME for tomcat_lk.service
if [ -f "${LABKEY_SRC_HOME}/${LABKEY_DIST_DIR}/labkeyServer-${LABKEY_VERSION}.jar" ]; then
cp -a "${LABKEY_SRC_HOME}/${LABKEY_DIST_DIR}/labkeyServer-${LABKEY_VERSION}.jar" "${LABKEY_INSTALL_HOME}/labkeyServer.jar"
cp -a "${LABKEY_SRC_HOME}/${LABKEY_DIST_DIR}/VERSION" "${LABKEY_INSTALL_HOME}/VERSION"
elif [ -f "${LABKEY_SRC_HOME}/${LABKEY_DIST_DIR}/labkeyServer.jar" ]; then
cp -a "${LABKEY_SRC_HOME}/${LABKEY_DIST_DIR}/labkeyServer.jar" "${LABKEY_INSTALL_HOME}/labkeyServer.jar"
cp -a "${LABKEY_SRC_HOME}/${LABKEY_DIST_DIR}/VERSION" "${LABKEY_INSTALL_HOME}/VERSION"
else
console_msg "ERROR: Something is wrong. Unable copy ${LABKEY_INSTALL_HOME}/labkeyServer.jar, please verify LabKey Version and distribution."
export ret=1
Expand Down Expand Up @@ -1032,7 +1030,6 @@ function step_tomcat_service_embedded() {
JAVA_LOG_JAR_OPS="-XX:ErrorFile=${LABKEY_INSTALL_HOME}/logs/error_%p.log -Dlog4j.configurationFile=log4j2.xml"
JAVA_REFLECTION_JAR_OPS="--add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED"
JAVA_TIMEZONE="-Duser.timezone=${TOMCAT_TIMEZONE}"
XDG_CACHE_HOME="${TOMCAT_TMP_DIR}"
LOCKFILE="$LABKEY_INSTALL_HOME/labkeyUpgradeLockFile"

# Add Tomcat service
Expand All @@ -1050,7 +1047,6 @@ function step_tomcat_service_embedded() {
[Service]
Type=simple
Environment="CATALINA_HOME=${TOMCAT_INSTALL_HOME}"
Environment="XDG_CACHE_HOME=${XDG_CACHE_HOME}"
Environment="JAVA_HOME=${JAVA_HOME}"
Environment="JAVA_PRE_JAR_OPS=${JAVA_PRE_JAR_OPS}"
Environment="JAVA_HEAP=${JAVA_HEAP}"
Expand Down
6 changes: 3 additions & 3 deletions sample_embedded_envs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export LABKEY_BASE_SERVER_URL="https://localhost"
#export LABKEY_INSTALL_SKIP_START_LABKEY_STEP=1
export POSTGRES_SVR_LOCAL="TRUE"

export LABKEY_DIST_URL="https://lk-binaries.s3.us-west-2.amazonaws.com/downloads/release/community/24.11.0/LabKey24.11.0-2-community.tar.gz"
export LABKEY_DIST_FILENAME="LabKey24.11.0-2-community.tar.gz"
export LABKEY_VERSION="24.11.0"
export LABKEY_DIST_URL="https://lk-binaries.s3.us-west-2.amazonaws.com/downloads/release/community/25.3.2/LabKey25.3.2-3-community.tar.gz"
export LABKEY_DIST_FILENAME="LabKey25.3.2-3-community.tar.gz"
export LABKEY_VERSION="25.3.2"
export LABKEY_DISTRIBUTION="community"