Skip to content

Commit

Permalink
Merge branch '2.7.x'
Browse files Browse the repository at this point in the history
Closes gh-33931
  • Loading branch information
philwebb committed Jan 21, 2023
2 parents e6351b5 + d84610c commit ff35329
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 3 deletions.
2 changes: 0 additions & 2 deletions ci/images/ci-image-jdk19/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
1 change: 0 additions & 1 deletion ci/images/ci-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]

0 comments on commit ff35329

Please sign in to comment.