From 473a3d5cefaa5ff15f377babbebde92ad860dc5b Mon Sep 17 00:00:00 2001 From: okalintu Date: Fri, 7 Apr 2017 15:37:58 +0300 Subject: [PATCH] Modify docker files from mariadb to postgreSQL --- docker-compose.yml | 4 ++-- scripts/db/Dockerfile | 7 ++----- scripts/db/init.sql | 15 ++++++++------- scripts/db/install.sh | 3 --- 4 files changed, 12 insertions(+), 17 deletions(-) delete mode 100755 scripts/db/install.sh diff --git a/docker-compose.yml b/docker-compose.yml index 91d7169..15e0f2d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,9 +4,9 @@ services: build: context: . dockerfile: scripts/db/Dockerfile - image: mariadb environment: - - MYSQL_ROOT_PASSWORD=toor + - POSTGRES_PASSWORD=toor + - POSTGRES_USER=root web: build: context: . diff --git a/scripts/db/Dockerfile b/scripts/db/Dockerfile index d1bcd2e..4bd2dee 100644 --- a/scripts/db/Dockerfile +++ b/scripts/db/Dockerfile @@ -1,5 +1,2 @@ -FROM mariadb:latest -RUN mkdir -p /db -WORKDIR /db -ADD scripts/db/init.sql /db/ -ADD scripts/db/install.sh /db/ +FROM postgres:9.6 +COPY scripts/db/init.sql /docker-entrypoint-initdb.d/init.sql diff --git a/scripts/db/init.sql b/scripts/db/init.sql index 968096b..acd8ab4 100644 --- a/scripts/db/init.sql +++ b/scripts/db/init.sql @@ -1,7 +1,8 @@ -DROP USER IF EXISTS 'sik'; -FLUSH PRIVILEGES; -CREATE USER 'sik'@'%' IDENTIFIED BY 'password123'; -CREATE DATABASE IF NOT EXISTS sik DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_general_ci; -GRANT ALL PRIVILEGES ON `sik\_%` . * TO 'sik'@'%' IDENTIFIED BY 'password123'; -GRANT ALL PRIVILEGES ON sik.* TO 'sik'@'%'; - +DROP ROLE IF EXISTS sik; +CREATE USER sik WITH PASSWORD 'password123'; +ALTER ROLE sik SET client_encoding TO 'utf8'; +ALTER ROLE sik SET default_transaction_isolation TO 'read committed'; +ALTER ROLE sik SET timezone TO 'UTC'; +CREATE DATABASE sik + ENCODING 'UTF8' + OWNER sik; diff --git a/scripts/db/install.sh b/scripts/db/install.sh deleted file mode 100755 index 53419b4..0000000 --- a/scripts/db/install.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -e -mysql -u root -ptoor < /db/init.sql