Skip to content

Commit 286fa96

Browse files
authored
Update Testkit Dockerfile (#1521)
* Update Teskit Dockerfile (#1412) * Update Dockerfile (#1501) * Update Maven to 3.9.2 (#1434) * Set Java to 8 and Maven to 3.9.6 * Update skipped zone ids for testing * Update backend.py
1 parent cb09a4d commit 286fa96

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

driver/src/test/java/org/neo4j/driver/util/TemporalUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public final class TemporalUtil {
6565
// `Unknown time-zone ID: US/Pacific-New`"
6666
"Pacific/Easter",
6767
"America/Ciudad_Juarez",
68-
"Europe/Kyiv" // might have issues when running with dated TZ db
69-
);
68+
"Europe/Kyiv", // might have issues when running with dated TZ db
69+
"America/Mazatlan");
7070

7171
private TemporalUtil() {}
7272

testkit/Dockerfile

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,32 @@
1-
# Install Maven 3.6, Java 11, Java 8 and Python3
2-
FROM maven:3.6.3-openjdk-8
1+
FROM debian:bullseye-slim
32

4-
RUN apt-get --quiet --quiet update \
5-
&& apt-get --quiet --quiet install -y bash python3 \
3+
ENV JAVA_HOME=/usr/lib/jvm/openjdk-8 \
4+
PYTHON=python3
5+
6+
RUN apt-get update && apt-get install -y \
7+
ca-certificates \
8+
curl \
9+
apt-transport-https \
10+
python3 \
11+
p11-kit \
612
&& rm -rf /var/lib/apt/lists/*
713

8-
ENV PYTHON=python3
9-
ENV JAVA_HOME=/usr/local/openjdk-8
10-
ENV PATH=$JAVA_HOME/bin:$PATH
14+
# https://hub.docker.com/_/eclipse-temurin
15+
COPY --from=eclipse-temurin:8-jdk /opt/java/openjdk $JAVA_HOME
16+
17+
COPY --from=maven:3.9.6-eclipse-temurin-8 /usr/share/maven /opt/apache-maven
1118

1219
# Install our own CAs on the image.
1320
# Assumes Linux Debian based image.
1421
# JAVA_HOME needed by update-ca-certificates hook to update Java with changed system CAs.
1522
COPY CAs/* /usr/local/share/ca-certificates/
1623
COPY CustomCAs/* /usr/local/share/custom-ca-certificates/
17-
RUN update-ca-certificates
24+
RUN echo 'jdk.tls.disabledAlgorithms=jdk.tls.disabledAlgorithms=SSLv3, TLSv1, RC4, DES, MD5withRSA, DH keySize < 1024, EC keySize < 224, 3DES_EDE_CBC, anon, NULL' > /testkit.java.security
25+
26+
# https://github.com/adoptium/containers/issues/293
27+
# https://github.com/adoptium/containers/pull/392
28+
# https://github.com/adoptium/containers/blob/f6d4923380ecb1ec4b0d58c633ebb0aeed4c8332/17/jdk/ubuntu/jammy/entrypoint.sh#L23
29+
RUN update-ca-certificates \
30+
&& trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$JAVA_HOME/jre/lib/security/cacerts"
31+
32+
ENV PATH=$JAVA_HOME/bin:/opt/apache-maven/bin:$PATH

testkit/backend.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
if __name__ == "__main__":
1212
subprocess.check_call(
13-
["java", "-Djdk.tls.client.protocols=TLSv1.3,TLSv1.2,TLSv1.1", "-jar", "testkit-backend/target/testkit-backend.jar",
13+
["java", "-Djava.security.properties=/testkit.java.security", "-jar", "testkit-backend/target/testkit-backend.jar",
1414
os.getenv('TEST_BACKEND_SERVER', '')],
1515
stdout=sys.stdout, stderr=sys.stderr
1616
)

0 commit comments

Comments
 (0)