Skip to content

Commit

Permalink
fix(build): correct jcharset library path for Tomcat setup
Browse files Browse the repository at this point in the history
Update the path for the jcharset-2.0.jar library to align with the
new directory structure under /var/lib/tomcats. Adjust CLASSPATH
in setenv.sh to reference the updated location for consistency.
  • Loading branch information
Amygos committed Dec 19, 2024
1 parent 2e6c6d0 commit e30549f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ reponame="webtop-webapp"
container=$(buildah from docker.io/library/tomcat:8-jre8)
buildah add ${container} ${webapp_tmp_dir}/webtop /usr/local/tomcat/webapps/webtop/
buildah add ${container} ${PWD}/webtop5-build/webtop-login/ /usr/local/tomcat/webapps/webtop/WEB-INF/classes/
buildah add ${container} ${jcharset_tmp_dir}/jcharset-2.0/lib/jcharset-2.0.jar /usr/local/tomcat/webapps/webtop/lib/
buildah add ${container} ${jcharset_tmp_dir}/jcharset-2.0/lib/jcharset-2.0.jar /var/lib/tomcats/webtop/lib/
buildah add ${container} ${PWD}/webtop5-build/ListTimeZones.class /usr/share/webtop/
buildah add ${container} ${PWD}/webtop5-build/WebtopPassEncode.class /usr/share/webtop/
buildah add ${container} ${PWD}/zfaker/wrappers/php /usr/share/webtop/bin/php
Expand Down
2 changes: 1 addition & 1 deletion webapp/var/lib/tomcats/webtop/bin/setenv.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CLASSPATH=$CATALINA_HOME/webapps/webtop/lib//lib/jcharset-2.0.jar
CLASSPATH=/var/lib/tomcats/webtop/lib/*.jar

0 comments on commit e30549f

Please sign in to comment.