Skip to content

Update Testkit Dockerfile #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 19, 2023
Merged

Update Testkit Dockerfile #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff5a3fe
Update Teskit Dockerfile (#1412)
injectives Apr 21, 2023
ef62070
Update Dockerfile (#1501)
injectives Nov 1, 2023
b033054
Update Maven to 3.9.2 (#1434)
injectives Jun 19, 2023
c8087fa
Set Java to 8 and Maven to 3.9.6
injectives Dec 19, 2023
e728c01
Update skipped zone ids for testing
injectives Dec 19, 2023
f1f0159
Update backend.py
injectives Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions driver/src/test/java/org/neo4j/driver/util/TemporalUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public final class TemporalUtil {
// `Unknown time-zone ID: US/Pacific-New`"
"Pacific/Easter",
"America/Ciudad_Juarez",
"Europe/Kyiv" // might have issues when running with dated TZ db
);
"Europe/Kyiv", // might have issues when running with dated TZ db
"America/Mazatlan");

private TemporalUtil() {}

Expand Down
31 changes: 23 additions & 8 deletions testkit/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
# Install Maven 3.6, Java 11, Java 8 and Python3
FROM maven:3.6.3-openjdk-8
FROM debian:bullseye-slim

RUN apt-get --quiet --quiet update \
&& apt-get --quiet --quiet install -y bash python3 \
ENV JAVA_HOME=/usr/lib/jvm/openjdk-8 \
PYTHON=python3

RUN apt-get update && apt-get install -y \
ca-certificates \
curl \
apt-transport-https \
python3 \
p11-kit \
&& rm -rf /var/lib/apt/lists/*

ENV PYTHON=python3
ENV JAVA_HOME=/usr/local/openjdk-8
ENV PATH=$JAVA_HOME/bin:$PATH
# https://hub.docker.com/_/eclipse-temurin
COPY --from=eclipse-temurin:8-jdk /opt/java/openjdk $JAVA_HOME

COPY --from=maven:3.9.6-eclipse-temurin-8 /usr/share/maven /opt/apache-maven

# Install our own CAs on the image.
# Assumes Linux Debian based image.
# JAVA_HOME needed by update-ca-certificates hook to update Java with changed system CAs.
COPY CAs/* /usr/local/share/ca-certificates/
COPY CustomCAs/* /usr/local/share/custom-ca-certificates/
RUN update-ca-certificates
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

# https://github.com/adoptium/containers/issues/293
# https://github.com/adoptium/containers/pull/392
# https://github.com/adoptium/containers/blob/f6d4923380ecb1ec4b0d58c633ebb0aeed4c8332/17/jdk/ubuntu/jammy/entrypoint.sh#L23
RUN update-ca-certificates \
&& trust extract --overwrite --format=java-cacerts --filter=ca-anchors --purpose=server-auth "$JAVA_HOME/jre/lib/security/cacerts"

ENV PATH=$JAVA_HOME/bin:/opt/apache-maven/bin:$PATH
2 changes: 1 addition & 1 deletion testkit/backend.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

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