Skip to content

Commit

Permalink
Merge pull request #3 from glats/develop
Browse files Browse the repository at this point in the history
Alpine updated to 3.11
  • Loading branch information
Juan Cuzmar authored Dec 20, 2019
2 parents e7bda22 + c2729a8 commit a661cac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.10.2
FROM alpine:3.11
ENV TIMEZONE America/Santiago
RUN apk update && apk upgrade
RUN apk add mariadb mariadb-client \
Expand Down
2 changes: 1 addition & 1 deletion entry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ echo "Done httpd"
echo "Checking /var/lib/mysql folder"
if [ ! -f /var/lib/mysql/ibdata1 ]; then
echo "Installing db"
mysql_install_db --user=mysql --verbose=1 --basedir=/usr --datadir=/var/lib/mysql --rpm > /dev/null
mariadb-install-db --user=mysql --ldata=/var/lib/mysql > /dev/null
echo "Installed"
fi;

Expand Down

0 comments on commit a661cac

Please sign in to comment.