Merge branch '2.7.x'

Closes gh-33931
2 years ago · ff35329a12
parent e6351b57ca d84610c712
commit ff35329a12
2 changed files with 0 additions and 3 deletions
--- a/ci/images/ci-image-jdk19/Dockerfile
+++ b/ci/images/ci-image-jdk19/Dockerfile
@ -8,5 +8,3 @@ RUN ./setup.sh java17 java19
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
 ADD docker-lib.sh /docker-lib.sh
 ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]
--- a/ci/images/ci-image/Dockerfile
+++ b/ci/images/ci-image/Dockerfile
@ -12,4 +12,3 @@ ADD docker-lib.sh /docker-lib.sh
 ADD build-release-scripts.sh /build-release-scripts.sh
 ADD releasescripts /release-scripts
 RUN ./build-release-scripts.sh
 ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]