Skip to content

Commit e029267

Browse files
committed
update logback package only
Change-Id: I5ecf08a8140d23a315be61a1bfd30c25fb986456 Depends-On: Ib8900e22ef8eb8cf974abd048c823b88b3b36ed3
1 parent ab63941 commit e029267

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

containers/external/cassandra/Dockerfile

+9-8
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,18 @@ RUN \
4141
chown -R ${CASSANDRA_USER}:${CASSANDRA_GROUP} ${CASSANDRA_CONFIG} ${CASSANDRA_LOG} ${CASSANDRA_LIB} && \
4242
ln -sT ${CASSANDRA_LIB} "${CASSANDRA_HOME}/data" && \
4343
ln -sT ${CASSANDRA_LOG} "${CASSANDRA_HOME}/logs" && \
44-
rm -f /opt/cassandra/lib/netty-all-* /opt/cassandra/lib/libthrift-* && \
45-
LIBTHRIFT_PACKAGE=libthrift-0.13.0.jar && \
46-
download_package https://github.com tungstenfabric/tf-third-party-cache/blob/master/libthrift/${LIBTHRIFT_PACKAGE}?raw=true ${LIBTHRIFT_PACKAGE} && \
47-
mv ${LIBTHRIFT_PACKAGE} /opt/cassandra/lib/ && \
48-
NETTY_ALL_PACKAGE=netty-all-4.1.39.Final.jar && \
49-
download_package https://repo1.maven.org maven2/io/netty/netty-all/4.1.39.Final/${NETTY_ALL_PACKAGE} ${NETTY_ALL_PACKAGE} && \
50-
mv ${NETTY_ALL_PACKAGE} /opt/cassandra/lib/ && \
44+
rm -f /opt/cassandra/lib/libthrift-* && \
45+
download_package https://github.com tungstenfabric/tf-third-party-cache/blob/master/libthrift/libthrift-0.13.0.jar?raw=true /opt/cassandra/lib/libthrift-0.13.0.jar && \
46+
rm -f /opt/cassandra/lib/netty-all-* && \
47+
download_package https://repo1.maven.org maven2/io/netty/netty-all/4.1.39.Final/netty-all-4.1.39.Final.jar /opt/cassandra/lib/netty-all-4.1.39.Final.jar && \
48+
rm -f /opt/cassandra/lib/logback-* && \
49+
LOGBACK_VERSION=1.2.0 && \
50+
download_package https://repo1.maven.org maven2/ch/qos/logback/logback-classic/1.2.0/logback-classic-1.2.0.jar /opt/cassandra/lib/logback-classic-1.2.0.jar && \
51+
download_package https://repo1.maven.org maven2/ch/qos/logback/logback-core/1.2.0/logback-core-1.2.0.jar /opt/cassandra/lib/logback-core-1.2.0.jar && \
5152
yum clean all -y && \
5253
rm -rf /var/cache/yum && \
5354
# smoke test
54-
cassandra -v
55+
cassandra -v
5556

5657
VOLUME $CASSANDRA_LIB
5758

containers/populate-cache.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ wget -nv -t3 -P linux/centos/7/x86_64/stable/Packages https://download.docker.co
5050

5151
wget -nv -t3 -P pub/archive/epel/8.4/Everything/x86_64/Packages/s https://archives.fedoraproject.org/pub/archive/epel/8.4/Everything/x86_64/Packages/s/sshpass-1.06-9.el8.x86_64.rpm
5252

53-
wget -nv -t3 -P maven2/org/apache/thrift/libthrift/0.12.0 https://repo1.maven.org/maven2/org/apache/thrift/libthrift/0.12.0/libthrift-0.12.0.jar
5453
wget -nv -t3 -P maven2/io/netty/netty-all/4.1.39.Final https://repo1.maven.org/maven2/io/netty/netty-all/4.1.39.Final/netty-all-4.1.39.Final.jar
54+
wget -nv -t3 -P maven2/ch/qos/logback/logback-classic/1.2.0 https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.0/logback-classic-1.2.0.jar
55+
wget -nv -t3 -P maven2/ch/qos/logback/logback-core/1.2.0 https://repo1.maven.org/maven2/ch/qos/logback/logback-core/1.2.0/logback-core-1.2.0.jar
5556

5657
wget -nv -t3 -P centos/7/os/x86_64/Packages http://mirror.centos.org/centos/7/os/x86_64/Packages/ntpdate-4.2.6p5-29.el7.centos.2.x86_64.rpm
5758
wget -nv -t3 -P centos/7/os/x86_64/Packages http://mirror.centos.org/centos/7/os/x86_64/Packages/ntp-4.2.6p5-29.el7.centos.2.x86_64.rpm

0 commit comments

Comments
 (0)