-
-
Notifications
You must be signed in to change notification settings - Fork 22
WIP: Start on Docker Integration #347
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
base: staging
Are you sure you want to change the base?
Changes from 1 commit
2bd7fab
5bb3dd0
a0c3ab0
b269549
c60b667
94e601c
8b5c4cb
024ff5e
72cd417
62e8d65
c525e5e
1fe54ec
63d2942
3ce6f23
d1e848a
7bea796
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| # This is created in the Dockerfile | ||
| conf/application.conf | ||
|
|
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| FROM ubuntu:latest | ||
|
|
||
| MAINTAINER Jadon Fowler <jadonflower@gmail.com> | ||
|
|
||
| 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"] | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -155,9 +155,9 @@ slick.dbs.default { | |
| driver = "org.postgresql.Driver" | ||
| url = "jdbc:postgresql://localhost/ore" | ||
| url = ${?JDBC_DATABASE_URL} | ||
| user = "root" | ||
| user = "spongeauth" | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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.
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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} | ||
| } | ||
| } | ||
|
|
||
| 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 | ||
|
|
Uh oh!
There was an error while loading. Please reload this page.