From 86665f5f1f7b85f029cd75d3bb7013cbc338a8a0 Mon Sep 17 00:00:00 2001 From: Nathan Dunn Date: Wed, 10 Jul 2019 05:59:48 -0700 Subject: [PATCH] updated docker documentation --- README.md | 2 +- docs/Setup.md | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/README.md b/README.md index 56347d4ab0..12e7a37836 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Launchable public Amazon Web Services (AWS) EC2 images may be [launched from Com Launch settings should be 2 vCPU, 8 GB recommended, 80 GB storage depending on the size of your data, and ports 22 and 8080 open at a minimum. The server will be available at . Binaries with be in the `apollo/bin` directory though it should be in the path. -Apollo may be launched from [Docker](docs/Setup.md#configure-for-docker) as well. +Apollo may be launched from [Docker](docs/Docker.md) as well. The [quick-start guide for developers](docs/Apollo2Build.md) shows how to easily get started with Apollo. diff --git a/docs/Setup.md b/docs/Setup.md index 199e19c74e..c717936bb2 100644 --- a/docs/Setup.md +++ b/docs/Setup.md @@ -75,7 +75,6 @@ server `apollo run-local` or `apollo debug` use the development environment (i.e * `apollo test` uses the test environment (i.e. only when running unit tests) - #### Configure for H2: - H2 is an embedded database engine, so no external setups are needed. Simply copy sample-h2-apollo-config.groovy to apollo-config.groovy. @@ -88,21 +87,11 @@ server `apollo run-local` or `apollo debug` use the development environment (i.e - Copy the sample-postgres-apollo-config.groovy to apollo-config.groovy. - #### Configure for MySQL: - Create a new MySQL database for production mode (i.e. run ``create database `apollo-production``` in the mysql console) and copy the sample-postgres-apollo-config.groovy to apollo-config.groovy. -#### Configure for Docker: -- Set up and export all of the environment variables you wish to configure. At bare minimum you will likely wish to set - `WEBAPOLLO_DB_USERNAME`, `WEBAPOLLO_DB_PASSWORD`, `WEBAPOLLO_DB_DRIVER`, `WEBAPOLLO_DB_DIALECT`, and -`WEBAPOLLO_DB_URI` -- Create a new database in your chosen database backend and copy the sample-docker-apollo-config.groovy to - apollo-config.groovy. -- [Instructions and a script for launching docker with apollo and PostgreSQL](https://github.com/GMOD/docker-apollo). - - #### Apollo in Galaxy Apollo can always be used externally from Galaxy, but there are a few integrations available as well.