Skip to content

Commit

Permalink
[tomcat] Stop adding sed explicitly into tomcat
Browse files Browse the repository at this point in the history
If sed ever stops being a direct dependency, then we can convert the sed call to
bash, but no need to complicate it just yet
  • Loading branch information
dcermak committed Dec 12, 2024
1 parent de4d87c commit 98ffa74
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bci_build/package/apache_tomcat.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ def _get_java_packages(jre_major: int) -> list[str]:
if tomcat_ver == _TOMCAT_VERSIONS[0]
else f"tomcat{tomcat_ver.partition('.')[0]}"
),
# currently needed by custom_end
"sed",
Package("util-linux", PackageType.DELETE),
]
+ _get_java_packages(jre_version),
Expand All @@ -120,6 +118,8 @@ def _get_java_packages(jre_major: int) -> list[str]:
},
custom_end=rf"""{DOCKERFILE_RUN} mkdir -p /var/log/tomcat; chown --recursive tomcat:tomcat /var/log/tomcat
{DOCKERFILE_RUN} ln -s {_CATALINA_HOME} /usr/local/tomcat
# in case sed stops being in the buildroot, convert the following to a shell
# script
{DOCKERFILE_RUN} \
sed -i /usr/share/tomcat/conf/logging.properties \
-e 's|org\.apache\.catalina\.core\.ContainerBase\.\[Catalina\]\.\[localhost\]\.handlers =.*|org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler|' \
Expand Down

0 comments on commit 98ffa74

Please sign in to comment.