Removed mysql useless startup fix (#88)

Osedea · Sep 12, 2017 · d923526 · d923526
1 parent f7d0ff7
commit d923526
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
@@ -1,7 +1,6 @@
 FROM mysql:5.7
 
 ADD my.cnf /etc/mysql/conf.d/my.cnf
-ADD startup /etc/mysql/startup
 
 RUN chown -R mysql:root /var/lib/mysql/
 
@@ -15,10 +14,5 @@ ENV MYSQL_USER=$MYSQL_USER
 ENV MYSQL_PASSWORD=$MYSQL_PASSWORD
 ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
 
-
-RUN sed -i 's/MYSQL_DATABASE/'$MYSQL_DATABASE'/g' /etc/mysql/startup && \
-    sed -i 's/MYSQL_USER/'$MYSQL_USER'/g' /etc/mysql/startup && \
-    sed -i 's/MYSQL_PASSWORD/'$MYSQL_PASSWORD'/g' /etc/mysql/startup
-
-CMD ["mysqld", "--init-file=/etc/mysql/startup"]
+CMD ["mysqld"]
 EXPOSE 3306
diff --git a/mysql/startup b/mysql/startup
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir /etc/nginx/sites-available && rm /etc/nginx/conf.d/default.conf
 ADD nginx.conf /etc/nginx/
 
 COPY scripts /root/scripts/
-COPY certs/* /etc/ssl/
+COPY certs /etc/ssl/
 
 COPY sites /etc/nginx/templates
 

diff --git a/nginx/certs/.gitkeep b/nginx/certs/.gitkeep