Skip to content

Commit 2e83286

Browse files
authored
Merge pull request #885 from infosiftr/entrypoint-back-compat
Add "/entrypoint.sh" backwards-compat symlink in Oracle-based images
2 parents f8d76ae + ea98f69 commit 2e83286

File tree

4 files changed

+7
-0
lines changed

4 files changed

+7
-0
lines changed

5.7/Dockerfile.oracle

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

8.0/Dockerfile.oracle

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

template/Dockerfile.debian

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ VOLUME /var/lib/mysql
9696
COPY config/ /etc/mysql/
9797
{{ ) else "" end -}}
9898
COPY docker-entrypoint.sh /usr/local/bin/
99+
{{ if [ "5.7", "8.0" ] | index(env.version) then ( -}}
99100
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
101+
{{ ) else "" end -}}
100102
ENTRYPOINT ["docker-entrypoint.sh"]
101103

102104
EXPOSE 3306 33060

template/Dockerfile.oracle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ RUN set -eux; \
130130
VOLUME /var/lib/mysql
131131

132132
COPY docker-entrypoint.sh /usr/local/bin/
133+
{{ if [ "5.7", "8.0" ] | index(env.version) then ( -}}
134+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
135+
{{ ) else "" end -}}
133136
ENTRYPOINT ["docker-entrypoint.sh"]
134137

135138
EXPOSE 3306 33060

0 commit comments

Comments
 (0)