Skip to content

Commit c441f1f

Browse files
cytopiacytopia
committed
Fix entrypoint and permissions
1 parent 41a518c commit c441f1f

15 files changed

Lines changed: 64 additions & 15 deletions

‎Dockerfiles/mariadb-10.0‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mariadb-10.1‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mariadb-10.2‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mariadb-10.3‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mariadb-10.4‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mariadb-10.5‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mariadb-5.5‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mysql-5.5‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mysql-5.6‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

‎Dockerfiles/mysql-5.7‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@ RUN set -eux \
88
elif [ -f /etc/mysql/my.cnf ]; then \
99
echo '!'"includedir /etc/mysql/docker-default.d/" >> /etc/mysql/my.cnf; \
1010
else \
11-
echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
11+
echo "/etc/my.cnf and /etc/mysql/my.cnf are not available"; \
1212
false; \
1313
fi \
14+
&& if [ -f "/entrypoint.sh" ]; then \
15+
mv "/entrypoint.sh" "/docker-entrypoint.sh"; \
16+
fi \
1417
&& chmod +x "/docker-entrypoint.sh"
1518

1619
ENTRYPOINT ["/docker-entrypoint.sh"]

0 commit comments

Comments
 (0)