Skip to content

Commit 5b1a6a2

Browse files
committed
Perform silliness with ENTRYPOINT (for consistency and clarity)
1 parent a936285 commit 5b1a6a2

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

5.5/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ RUN mkdir -p /etc/mysql/conf.d \
5353

5454
VOLUME /var/lib/mysql
5555

56-
COPY docker-entrypoint.sh /entrypoint.sh
57-
ENTRYPOINT ["/entrypoint.sh"]
56+
COPY docker-entrypoint.sh /usr/local/bin/
57+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
58+
ENTRYPOINT ["docker-entrypoint.sh"]
5859

5960
EXPOSE 3306
6061
CMD ["mysqld"]

5.6/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \
3939

4040
VOLUME /var/lib/mysql
4141

42-
COPY docker-entrypoint.sh /entrypoint.sh
43-
ENTRYPOINT ["/entrypoint.sh"]
42+
COPY docker-entrypoint.sh /usr/local/bin/
43+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
44+
ENTRYPOINT ["docker-entrypoint.sh"]
4445

4546
EXPOSE 3306
4647
CMD ["mysqld"]

5.7/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ RUN sed -Ei 's/^(bind-address|log)/#&/' /etc/mysql/my.cnf \
3939

4040
VOLUME /var/lib/mysql
4141

42-
COPY docker-entrypoint.sh /entrypoint.sh
43-
ENTRYPOINT ["/entrypoint.sh"]
42+
COPY docker-entrypoint.sh /usr/local/bin/
43+
RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
44+
ENTRYPOINT ["docker-entrypoint.sh"]
4445

4546
EXPOSE 3306
4647
CMD ["mysqld"]

0 commit comments

Comments
 (0)