diff --git a/db/Dockerfile b/db/Dockerfile index c6eff03..e7416c3 100644 --- a/db/Dockerfile +++ b/db/Dockerfile @@ -1,4 +1,4 @@ -FROM mariadb:10 +FROM mariadb:10.3 COPY custom.conf /etc/mysql COPY initialize.sql /docker-entrypoint-initdb.d/ diff --git a/db/initialize.sql b/db/initialize.sql index fcc8353..e7cfd44 100644 --- a/db/initialize.sql +++ b/db/initialize.sql @@ -1,4 +1,4 @@ -CREATE USER `signpic`@`%`; +CREATE USER `signpic`@`%` IDENTIFIED BY 'password'; GRANT INSERT,SELECT,UPDATE,DELETE ON `signpic_db`.* TO `signpic`@`%`; CREATE DATABASE IF NOT EXISTS `signpic_db`; diff --git a/web/server.go b/web/server.go index 8e781ce..39d39ad 100644 --- a/web/server.go +++ b/web/server.go @@ -13,9 +13,6 @@ import ( "github.com/Team-Fruit/SignPicDB/web/handlers" "github.com/Team-Fruit/SignPicDB/web/models" "github.com/Team-Fruit/SignPicDB/web/ws" - - "github.com/rakyll/statik/fs" - _ "github.com/Team-Fruit/SignPicDB/web/statik" ) type ( @@ -40,14 +37,9 @@ func uuidValidator(fl validator.FieldLevel) bool { } func main() { - db := sqlx.MustConnect("mysql", "signpic:@tcp(db:3306)/signpic_db") + db := sqlx.MustConnect("mysql", "signpic:password@tcp(db:3306)/signpic_db") defer db.Close() - _, err := fs.New() - if err != nil { - panic(err) - } - e := echo.New() e.Use(middleware.Logger())