Skip to content

Commit

Permalink
Start on Docker Integration
Browse files Browse the repository at this point in the history
SpongeAuth fails to connect to the DB currently but we're getting
there.

Signed-off-by: Jadon Fowler <[email protected]>
  • Loading branch information
phase committed Jan 7, 2018
1 parent a0eef16 commit 2bd7fab
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# This is created in the Dockerfile
conf/application.conf

26 changes: 26 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
FROM ubuntu:latest

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 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

# Copy Ore
RUN mkdir -p /home/play/ore/
WORKDIR /home/play/ore/
ADD . /home/play/ore/

# Ore runs on port 9000
# 8888 is the Activator UI
EXPOSE 9000

RUN cp conf/application.conf.template conf/application.conf

CMD ["activator", "run"]

4 changes: 2 additions & 2 deletions conf/application.conf.template
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,9 @@ slick.dbs.default {
driver = "org.postgresql.Driver"
url = "jdbc:postgresql://localhost/ore"
url = ${?JDBC_DATABASE_URL}
user = "root"
user = "spongeauth"
user = ${?JDBC_DATABASE_USERNAME}
password = ""
password = "spongeauth"
password = ${?JDBC_DATABASE_PASSWORD}
}
}
Expand Down
19 changes: 19 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: "2"

services:
app:
build: .
ports:
- "9000:9000"
links:
- "db"
- "spongeauth"
db:
image: postgres:9.6
environment:
POSTGRES_USER: spongeauth
POSTGRES_PASSWORD: spongeauth
POSTGRES_DB: spongeauth
spongeauth:
image: spongepowered/spongeauth

0 comments on commit 2bd7fab

Please sign in to comment.