Skip to content

Commit

Permalink
fixed issue laradock#1017, added ENV variables back to Dockerfile an…
Browse files Browse the repository at this point in the history
…d added startup file back
  • Loading branch information
sakanaproductions committed Jul 1, 2017
1 parent 7c9f9c1 commit 19f9b25
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
18 changes: 17 additions & 1 deletion mysql/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,24 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

RUN chown -R mysql:root /var/lib/mysql/

ADD startup /etc/mysql/startup

ARG MYSQL_DATABASE=default
ARG MYSQL_USER=default
ARG MYSQL_PASSWORD=secret
ARG MYSQL_ROOT_PASSWORD=root

ENV MYSQL_DATABASE=$MYSQL_DATABASE
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

ADD my.cnf /etc/mysql/conf.d/my.cnf

CMD ["mysqld"]
CMD ["mysqld", "--init-file=/etc/mysql/startup"]

EXPOSE 3306
3 changes: 3 additions & 0 deletions mysql/startup
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
DROP USER MYSQL_USER;
CREATE DATABASE IF NOT EXISTS MYSQL_DATABASE;
GRANT ALL ON `MYSQL_DATABASE`.* TO 'MYSQL_USER'@'%' IDENTIFIED BY 'MYSQL_PASSWORD';

0 comments on commit 19f9b25

Please sign in to comment.