@@ -39,8 +39,8 @@ RUN set -x \
39
39
&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture)" \
40
40
&& wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$(dpkg --print-architecture).asc" \
41
41
&& export GNUPGHOME="$(mktemp -d)" \
42
- && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
43
- && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
42
+ && gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \
43
+ && gpg --no-tty -- batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \
44
44
&& { command -v gpgconf && gpgconf --kill all || :; } \
45
45
&& rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc \
46
46
&& chmod +x /usr/local/bin/gosu \
@@ -174,10 +174,12 @@ RUN set -ex; \
174
174
sed -ri 's/^(JVM_PATCH_VERSION)=.*/\1 =25/' "$CASSANDRA_CONFIG/cassandra-env.sh"
175
175
176
176
# copy readiness probe script for kubernetes
177
- COPY --chown=cassandra:cassandra ready-probe.sh /
178
-
177
+ COPY ready-probe.sh /
179
178
# Add custom logback.xml including variables.
180
- COPY --chown=cassandra:cassandra logback.xml $CASSANDRA_CONFIG/
179
+ COPY logback.xml $CASSANDRA_CONFIG/
180
+
181
+ # Can't use COPY --chown here because it is not supported on old docker versions
182
+ RUN chown cassandra:cassandra ready-probe.sh $CASSANDRA_CONFIG/logback.xml
181
183
182
184
COPY docker-entrypoint.sh /usr/local/bin/
183
185
RUN ln -s usr/local/bin/docker-entrypoint.sh /docker-entrypoint.sh # backwards compat
0 commit comments