From a0c3ab0042668d773332e9baa52f781d0504ce1c Mon Sep 17 00:00:00 2001 From: Jadon Fowler Date: Mon, 5 Mar 2018 13:16:57 -0800 Subject: [PATCH] Reset Ore password & Change Docker Image Signed-off-by: Jadon Fowler --- Dockerfile | 8 +++----- conf/application.conf.template | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae0e6eaa5..25bdf5aaf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,10 @@ -FROM ubuntu:latest +FROM openjdk:8-jdk-alpine MAINTAINER Jadon Fowler -RUN apt-get update -RUN apt-get install -y default-jdk - # Install Activator -RUN apt-get install -y unzip curl +RUN apk add curl +RUN apk add unzip RUN curl -O http://downloads.typesafe.com/typesafe-activator/1.3.6/typesafe-activator-1.3.6.zip RUN unzip typesafe-activator-1.3.6.zip -d / && rm typesafe-activator-1.3.6.zip && chmod a+x /activator-dist-1.3.6/activator ENV PATH $PATH:/activator-dist-1.3.6 diff --git a/conf/application.conf.template b/conf/application.conf.template index 2ca7109f8..30fdd698e 100755 --- a/conf/application.conf.template +++ b/conf/application.conf.template @@ -163,9 +163,9 @@ slick.dbs.default { driver = "org.postgresql.Driver" url = "jdbc:postgresql://localhost/ore" url = ${?JDBC_DATABASE_URL} - user = "spongeauth" + user = "root" user = ${?JDBC_DATABASE_USERNAME} - password = "spongeauth" + password = "" password = ${?JDBC_DATABASE_PASSWORD} } } @@ -265,4 +265,4 @@ filters { block-all-mixed-content = [] } } -} \ No newline at end of file +}