Skip to content

Commit

Permalink
Reset Ore password & Change Docker Image
Browse files Browse the repository at this point in the history
Signed-off-by: Jadon Fowler <[email protected]>
  • Loading branch information
phase committed Mar 5, 2018
1 parent 5bb3dd0 commit a0c3ab0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
FROM ubuntu:latest
FROM openjdk:8-jdk-alpine

MAINTAINER Jadon Fowler <[email protected]>

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
Expand Down
6 changes: 3 additions & 3 deletions conf/application.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}
}
Expand Down Expand Up @@ -265,4 +265,4 @@ filters {
block-all-mixed-content = []
}
}
}
}

0 comments on commit a0c3ab0

Please sign in to comment.