Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Start on Docker Integration #347

Open
wants to merge 16 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leave the defaults, i don't know what this will break. the docker container & local users should set this however they want.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is Ore's connection to the database, it shouldn't use the same credentials as the spongeauth connection

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