Fix entrypoint.sh

cytopia · cytopia · commit 0d35e7219a40 · 2020-11-13T14:13:22.000+01:00
diff --git a/Dockerfiles/mariadb-10.0 b/Dockerfiles/mariadb-10.0
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mariadb-10.1 b/Dockerfiles/mariadb-10.1
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mariadb-10.2 b/Dockerfiles/mariadb-10.2
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mariadb-10.3 b/Dockerfiles/mariadb-10.3
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mariadb-10.4 b/Dockerfiles/mariadb-10.4
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mariadb-10.5 b/Dockerfiles/mariadb-10.5
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mariadb-5.5 b/Dockerfiles/mariadb-5.5
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mysql-5.5 b/Dockerfiles/mysql-5.5
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mysql-5.6 b/Dockerfiles/mysql-5.6
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mysql-5.7 b/Dockerfiles/mysql-5.7
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/mysql-8.0 b/Dockerfiles/mysql-8.0
@@ -12,4 +12,7 @@ RUN set -eux \
 		false; \
 	fi \
 # Allow native password handling for MySQL 8.0
-	&& sed -i'' 's/^\[mysqld\]/[mysqld]\ndefault-authentication-plugin=mysql_native_password/g' /etc/mysql/my.cnf
+	&& sed -i'' 's/^\[mysqld\]/[mysqld]\ndefault-authentication-plugin=mysql_native_password/g' /etc/mysql/my.cnf \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/percona-5.5 b/Dockerfiles/percona-5.5
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/percona-5.6 b/Dockerfiles/percona-5.6
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/percona-5.7 b/Dockerfiles/percona-5.7
@@ -10,4 +10,7 @@ RUN set -eux \
 	else \
 		echo "/etc/my.cnf and /etc/mysql/my.cnf are not availanle"; \
 		false; \
-	fi
+	fi \
+	&& chmod +x "/docker-entrypoint.sh"
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/Dockerfiles/percona-8.0 b/Dockerfiles/percona-8.0
@@ -13,5 +13,8 @@ RUN set -eux \
 		false; \
 	fi \
 # Allow native password handling for MySQL 8.0
-	&& sed -i'' "s|^pid-file=.*$|pid-file=/var/run/mysqld/mysqld.pid\ndefault-authentication-plugin=mysql_native_password|g" /etc/my.cnf
+	&& sed -i'' "s|^pid-file=.*$|pid-file=/var/run/mysqld/mysqld.pid\ndefault-authentication-plugin=mysql_native_password|g" /etc/my.cnf \
+	&& chmod +x "/docker-entrypoint.sh"
+
 USER mysql
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/tests/00-entrypoint.sh b/tests/00-entrypoint.sh
@@ -9,6 +9,9 @@ VERSION="${2}"
 
 
 # Ensure they all have a common entrypoint
-docker image inspect "${IMAGE}:${TYPE}-${VERSION}" \
+if ! docker image inspect "${IMAGE}:${TYPE}-${VERSION}" \
 	| grep '"Entrypoint":' -A 1 \
-	| grep '"docker-entrypoint.sh"'
+	| grep -E '"/?docker-entrypoint.sh"'; then
+	docker image inspect "${IMAGE}:${TYPE}-${VERSION}" | grep -i "entrypoint" || true
+	exit 1
+fi
