Skip to content

Commit 9147d15

Browse files
committed
update some java docker images for crypto security
1 parent 863c503 commit 9147d15

File tree

4 files changed

+97
-47
lines changed

4 files changed

+97
-47
lines changed

gradle/Dockerfile

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,32 @@
1-
FROM openjdk:8u151-jdk-alpine
1+
FROM openjdk:8u151-jre-alpine3.7
22
MAINTAINER Maksim Kostromin https://github.com/daggerok
3-
RUN apk --no-cache add busybox-suid bash curl sudo \
3+
RUN apk --no-cache --update add busybox-suid bash curl unzip sudo openssh-client shadow wget \
44
&& adduser -h /home/appuser -s /bin/bash -D -u 1025 appuser wheel \
55
&& echo "appuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
66
&& sed -i "s/.*requiretty$/Defaults !requiretty/" /etc/sudoers \
7-
&& apk del busybox-suid \
8-
&& rm -rf /tmp/* /var/cache/apk/*
7+
&& wget --no-cookies \
8+
--no-check-certificate \
9+
--header "Cookie: oraclelicense=accept-securebackup-cookie" \
10+
"http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip" \
11+
-O /tmp/jce_policy-8.zip \
12+
&& unzip -o /tmp/jce_policy-8.zip -d /tmp \
13+
&& mv -f ${JAVA_HOME}/lib/security ${JAVA_HOME}/lib/backup-security \
14+
&& mv -f /tmp/UnlimitedJCEPolicyJDK8 ${JAVA_HOME}/lib/security \
15+
&& apk del busybox-suid unzip openssh-client shadow wget \
16+
&& rm -rf /var/cache/apk/* /tmp/*
917
USER appuser
1018
WORKDIR /home/appuser
1119
VOLUME /home/appuser
12-
ENTRYPOINT java -XX:+UnlockExperimentalVMOptions \
20+
# ARG JAVA_OPTS_ARGS="\
21+
# -Djava.net.preferIPv4Stack=true \
22+
# -XX:+UnlockExperimentalVMOptions \
23+
# -XX:+UseCGroupMemoryLimitForHeap \
24+
# -XshowSettings:vm "
25+
# ENV JAVA_OPTS="${JAVA_OPTS} ${JAVA_OPTS_ARGS}"
26+
# ENTRYPOINT java ${JAVA_OPTS} -jar ./app.jar
27+
# CMD /bin/bash
28+
ENTRYPOINT java -Djava.net.preferIPv4Stack=true \
29+
-XX:+UnlockExperimentalVMOptions \
1330
-XX:+UseCGroupMemoryLimitForHeap \
1431
-XshowSettings:vm \
1532
-jar ./app.jar

maven/Dockerfile

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,38 @@
1-
FROM openjdk:8u151-jre-alpine
1+
FROM openjdk:8u151-jre-alpine3.7
22
MAINTAINER Maksim Kostromin https://github.com/daggerok
3-
RUN apk --no-cache add busybox-suid bash curl sudo \
3+
RUN apk --no-cache --update add busybox-suid bash curl unzip sudo openssh-client shadow wget \
44
&& adduser -h /home/appuser -s /bin/bash -D -u 1025 appuser wheel \
55
&& echo "appuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
66
&& sed -i "s/.*requiretty$/Defaults !requiretty/" /etc/sudoers \
7-
&& apk del busybox-suid \
8-
&& rm -rf /tmp/* /var/cache/apk/*
7+
&& wget --no-cookies \
8+
--no-check-certificate \
9+
--header "Cookie: oraclelicense=accept-securebackup-cookie" \
10+
"http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip" \
11+
-O /tmp/jce_policy-8.zip \
12+
&& unzip -o /tmp/jce_policy-8.zip -d /tmp \
13+
&& mv -f ${JAVA_HOME}/lib/security ${JAVA_HOME}/lib/backup-security \
14+
&& mv -f /tmp/UnlimitedJCEPolicyJDK8 ${JAVA_HOME}/lib/security \
15+
&& apk del busybox-suid unzip openssh-client shadow wget \
16+
&& rm -rf /var/cache/apk/* /tmp/*
917
USER appuser
1018
WORKDIR /home/appuser
1119
VOLUME /home/appuser
12-
ENTRYPOINT java -XX:+UnlockExperimentalVMOptions \
13-
-XX:+UseCGroupMemoryLimitForHeap \
14-
-XshowSettings:vm \
15-
-jar ./app.jar
20+
ARG JAVA_OPTS_ARGS="\
21+
-Djava.net.preferIPv4Stack=true \
22+
-XX:+UnlockExperimentalVMOptions \
23+
-XX:+UseCGroupMemoryLimitForHeap \
24+
-XshowSettings:vm "
25+
ENV JAVA_OPTS="${JAVA_OPTS} ${JAVA_OPTS_ARGS}"
26+
ENTRYPOINT java ${JAVA_OPTS} -jar ./app.jar
1627
CMD /bin/bash
28+
# ENTRYPOINT java -Djava.net.preferIPv4Stack=true \
29+
# -XX:+UnlockExperimentalVMOptions \
30+
# -XX:+UseCGroupMemoryLimitForHeap \
31+
# -XshowSettings:vm \
32+
# -jar ./app.jar
33+
# CMD /bin/bash
1734
EXPOSE 8080
18-
HEALTHCHECK --timeout=1s \
19-
--retries=35 \
35+
HEALTHCHECK --timeout=2s \
36+
--retries=22 \
2037
CMD curl -f http://127.0.0.1:8080/actuator/health || exit 1
2138
COPY --chown=appuser ./target/*.jar ./app.jar

spring-boot/Dockerfile

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
1-
FROM openjdk:8u131-jre-alpine
1+
FROM openjdk:8u151-jre-alpine3.7
22
MAINTAINER Maksim Kostromin https://github.com/daggerok
3-
RUN apk --no-cache --update add busybox-suid bash curl unzip sudo openssh-client shadow \
4-
&& addgroup app-group \
5-
&& echo "app ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
3+
RUN apk --no-cache --update add busybox-suid bash curl unzip sudo openssh-client shadow wget \
4+
&& adduser -h /home/appuser -s /bin/bash -D -u 1025 appuser wheel \
5+
&& echo "appuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
66
&& sed -i "s/.*requiretty$/Defaults !requiretty/" /etc/sudoers \
7-
&& adduser -h /home/app -s /bin/bash -D -u 1025 app app-group \
8-
&& usermod -a -G wheel app \
9-
&& apk del busybox-suid unzip openssh-client shadow \
7+
&& wget --no-cookies \
8+
--no-check-certificate \
9+
--header "Cookie: oraclelicense=accept-securebackup-cookie" \
10+
"http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip" \
11+
-O /tmp/jce_policy-8.zip \
12+
&& unzip -o /tmp/jce_policy-8.zip -d /tmp \
13+
&& mv -f ${JAVA_HOME}/lib/security ${JAVA_HOME}/lib/backup-security \
14+
&& mv -f /tmp/UnlimitedJCEPolicyJDK8 ${JAVA_HOME}/lib/security \
15+
&& apk del busybox-suid unzip openssh-client shadow wget \
1016
&& rm -rf /var/cache/apk/* /tmp/*
11-
USER app
12-
WORKDIR /home/app
13-
VOLUME ["/home/app"]
14-
ENTRYPOINT java -XX:+UnlockExperimentalVMOptions \
15-
-XX:+UseCGroupMemoryLimitForHeap \
16-
-XshowSettings:vm \
17-
-jar ./app.jar
17+
USER appuser
18+
WORKDIR /home/appuser
19+
VOLUME /home/appuser
20+
ARG JAVA_OPTS_ARGS="\
21+
-Djava.net.preferIPv4Stack=true \
22+
-XX:+UnlockExperimentalVMOptions \
23+
-XX:+UseCGroupMemoryLimitForHeap \
24+
-XshowSettings:vm "
25+
ENV JAVA_OPTS="${JAVA_OPTS} ${JAVA_OPTS_ARGS}"
26+
ENTRYPOINT java ${JAVA_OPTS} -jar ./app.jar
1827
CMD /bin/bash
1928
EXPOSE 8080
20-
HEALTHCHECK --timeout=1s \
21-
--retries=33 \
29+
HEALTHCHECK --timeout=2s \
30+
--retries=22 \
2231
CMD curl -f http://127.0.0.1:8080/actuator/health || exit 1
23-
COPY --chown=app ./build/libs/*.jar ./app.jar
32+
COPY --chown=appuser ./build/libs/*.jar ./app.jar

spring-boot/config-server/Dockerfile

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
1-
#FROM openjdk:8u131-jre-alpine
2-
FROM openjdk:8u151-jre-alpine
1+
FROM openjdk:8u151-jre-alpine3.7
32
MAINTAINER Maksim Kostromin https://github.com/daggerok
4-
RUN apk --no-cache --update add busybox-suid bash curl unzip sudo openssh-client shadow \
5-
&& addgroup appuser-group \
3+
RUN apk --no-cache --update add busybox-suid bash curl unzip sudo openssh-client shadow wget \
4+
&& adduser -h /home/appuser -s /bin/bash -D -u 1025 appuser wheel \
65
&& echo "appuser ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers \
76
&& sed -i "s/.*requiretty$/Defaults !requiretty/" /etc/sudoers \
8-
&& adduser -h /home/appuser -s /bin/bash -D -u 1025 appuser appuser-group \
9-
&& usermod -a -G wheel appuser \
10-
&& apk del busybox-suid unzip openssh-client shadow \
7+
&& wget --no-cookies \
8+
--no-check-certificate \
9+
--header "Cookie: oraclelicense=accept-securebackup-cookie" \
10+
"http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip" \
11+
-O /tmp/jce_policy-8.zip \
12+
&& unzip -o /tmp/jce_policy-8.zip -d /tmp \
13+
&& mv -f ${JAVA_HOME}/lib/security ${JAVA_HOME}/lib/backup-security \
14+
&& mv -f /tmp/UnlimitedJCEPolicyJDK8 ${JAVA_HOME}/lib/security \
15+
&& apk del busybox-suid unzip openssh-client shadow wget \
1116
&& rm -rf /var/cache/apk/* /tmp/*
1217
USER appuser
1318
WORKDIR /home/appuser
14-
VOLUME ["/home/appuser"]
15-
ENTRYPOINT java -XX:+UnlockExperimentalVMOptions \
16-
-XX:+UseCGroupMemoryLimitForHeap \
17-
-XshowSettings:vm \
18-
-jar ./app.jar
19+
VOLUME /home/appuser
20+
ARG JAVA_OPTS_ARGS="\
21+
-Djava.net.preferIPv4Stack=true \
22+
-XX:+UnlockExperimentalVMOptions \
23+
-XX:+UseCGroupMemoryLimitForHeap \
24+
-XshowSettings:vm "
25+
ENV JAVA_OPTS="${JAVA_OPTS} ${JAVA_OPTS_ARGS}"
26+
ENTRYPOINT java ${JAVA_OPTS} -jar ./app.jar
1927
CMD /bin/bash
2028
EXPOSE 8888
21-
HEALTHCHECK --interval=1s \
22-
--timeout=1s \
23-
--retries=33 \
29+
HEALTHCHECK --timeout=2s \
30+
--retries=22 \
2431
CMD curl -f http://127.0.0.1:8888/health || exit 1
2532
COPY --chown=appuser ./build/libs/*.jar ./app.jar

0 commit comments

Comments
 (0)