This is an automated email from the ASF dual-hosted git repository.
zrhoffman pushed a commit to branch 6.1.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/6.1.x by this push:
new 72c5468d0c Update Tomcat to 9.0.67 (#7093)
72c5468d0c is described below
commit 72c5468d0c2da6bee1858b50abd6a0eace508f3e
Author: Zach Hoffman <[email protected]>
AuthorDate: Tue Oct 4 15:05:35 2022 +0000
Update Tomcat to 9.0.67 (#7093)
---
CHANGELOG.md | 1 +
dev/traffic_router/Dockerfile | 43 +++++++++++++++++++++++++++++++++++++++
traffic_router/build/build_rpm.sh | 2 +-
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e0e2afe53..4548362599 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
### Changed
- Added Rocky Linux 8 support
+- Updated Apache Tomcat from 9.0.43 to 9.0.67
## [6.1.0] - 2022-01-18
### Added
diff --git a/dev/traffic_router/Dockerfile b/dev/traffic_router/Dockerfile
new file mode 100644
index 0000000000..51c88bd1d9
--- /dev/null
+++ b/dev/traffic_router/Dockerfile
@@ -0,0 +1,43 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+FROM alpine:latest AS trafficrouter-dev
+
+ENV TC=/go/src/github.com/apache/trafficcontrol
+VOLUME "$TC"
+ENV
JPDA_OPTS="-agentlib:jdwp=transport=dt_socket,address=*:5005,server=y,suspend=n"
\
+ JAVA_HOME=/usr/lib/jvm/java-11-openjdk M2_HOME=${TC}/trafficcontrol/.m2
\
+ CATALINA_BASE=/opt/traffic_router \
+ TRAFFIC_MONITOR_HOSTS=trafficmonitor \
+
CATALINA_OPTS=-Dlog4j.configurationFile=/opt/traffic_router/conf/log4j2.xml
+EXPOSE 3053:53/tcp \
+ 3053:53/udp \
+ 3080:80 \
+ 3443:443 \
+ 3333:3333 \
+ 2222:3443 \
+ 5005:5005
+
+RUN apk add --no-cache openjdk11 inotify-tools maven tomcat-native openssl &&
ln -s /usr/lib/jvm/java-11-openjdk/bin/jdb /bin/jdb
+
+ADD
https://archive.apache.org/dist/tomcat/tomcat-9/v9.0.67/bin/apache-tomcat-9.0.67.tar.gz
/opt/tomcat.tgz
+
+RUN cd /opt && \
+ tar -xf tomcat.tgz && \
+ mv apache-tomcat-* tomcat && \
+ rm -r tomcat.tgz tomcat/webapps/*
/usr/share/java/maven-3/conf/settings.xml && \
+ ln -s "${TC}/dev/traffic_router" /opt/traffic_router
+
+COPY settings.xml /usr/share/java/maven-3/conf/settings.xml
+
+CMD "${TC}/dev/traffic_router/run.sh"
diff --git a/traffic_router/build/build_rpm.sh
b/traffic_router/build/build_rpm.sh
index 5f2ab9675f..f7025265d9 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -81,7 +81,7 @@ adaptEnvironment() {
RPM="${PACKAGE}-${TC_VERSION}-${BUILD_NUMBER}.x86_64.rpm"
RPM_TARGET_OS="${RPM_TARGET_OS:-linux}"
TOMCAT_VERSION=9.0
- TOMCAT_RELEASE=43
+ TOMCAT_RELEASE=67
export PACKAGE TC_VERSION BUILD_NUMBER WORKSPACE RPMBUILD DIST RPM
RPM_TARGET_OS TOMCAT_VERSION TOMCAT_RELEASE
echo "=================================================="
