From ea98f69d0bdab12f99731ed74e584317c246f3fd Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 8 Jul 2022 10:36:23 -0700 Subject: [PATCH] Add "/entrypoint.sh" backwards-compat symlink in Oracle-based images --- 5.7/Dockerfile.oracle | 1 + 8.0/Dockerfile.oracle | 1 + template/Dockerfile.debian | 2 ++ template/Dockerfile.oracle | 3 +++ 4 files changed, 7 insertions(+) diff --git a/5.7/Dockerfile.oracle b/5.7/Dockerfile.oracle index f1fb6ac5a..3d2329e2b 100644 --- a/5.7/Dockerfile.oracle +++ b/5.7/Dockerfile.oracle @@ -115,6 +115,7 @@ RUN set -eux; \ VOLUME /var/lib/mysql COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 33060 diff --git a/8.0/Dockerfile.oracle b/8.0/Dockerfile.oracle index f5a2fd65d..4ae731bce 100644 --- a/8.0/Dockerfile.oracle +++ b/8.0/Dockerfile.oracle @@ -115,6 +115,7 @@ RUN set -eux; \ VOLUME /var/lib/mysql COPY docker-entrypoint.sh /usr/local/bin/ +RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 33060 diff --git a/template/Dockerfile.debian b/template/Dockerfile.debian index d80cf1e0d..a0236bd53 100644 --- a/template/Dockerfile.debian +++ b/template/Dockerfile.debian @@ -96,7 +96,9 @@ VOLUME /var/lib/mysql COPY config/ /etc/mysql/ {{ ) else "" end -}} COPY docker-entrypoint.sh /usr/local/bin/ +{{ if [ "5.7", "8.0" ] | index(env.version) then ( -}} RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat +{{ ) else "" end -}} ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 33060 diff --git a/template/Dockerfile.oracle b/template/Dockerfile.oracle index d71bf590a..4d9865e7e 100644 --- a/template/Dockerfile.oracle +++ b/template/Dockerfile.oracle @@ -130,6 +130,9 @@ RUN set -eux; \ VOLUME /var/lib/mysql COPY docker-entrypoint.sh /usr/local/bin/ +{{ if [ "5.7", "8.0" ] | index(env.version) then ( -}} +RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat +{{ ) else "" end -}} ENTRYPOINT ["docker-entrypoint.sh"] EXPOSE 3306 33060