diff --git a/README.md b/README.md index 7a3c30bc6..8d1eacb0c 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,12 @@ This monorepo will eventually contain all civ projects and development ### Containers A docker compose stack is provided to help test containers built from -this repo. To start the stack, run the following command: -`docker compose up --build`. Please note that this stack is NOT suitable for production use. +this repo. To start the stack, run the following commands: + +1. `gradle :ansible:build` +2. `docker compose up` + +Please note that this stack is NOT suitable for production use. Container data (world, logs, etc.) are mounted at [./containers/data](./containers/data). diff --git a/ansible/README.md b/ansible/README.md index 993e2d18d..538b88f06 100644 --- a/ansible/README.md +++ b/ansible/README.md @@ -1,6 +1,9 @@ # CivAnsible This project is a hybrid gradle/ansible project that is designed to provision and deploy services to a server. +Vendored plugins are located in `src/` (gradle), since they are used to build the end plugin directory (`/build/`) +Configs are located in `files/`, since they are purely copied by ansible + ## Prerequisites 1. Create a user on the server named `actions` with sudo privileges 2. Create Environments in Github settings with the following environment secrets: diff --git a/docker-compose.yml b/docker-compose.yml index b43eb0e9f..3096ba29f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -34,7 +34,7 @@ services: volumes: - ./containers/data/proxy:/data - ./ansible/files/proxy-config:/config - - ./ansible/files/proxy-plugins:/plugins + - ./ansible/build/proxy-plugins:/plugins paper: image: itzg/minecraft-server@sha256:346cb47929edc36e977f3b064f882a9c919df65fe4807ac35c05fdacf442822f @@ -81,7 +81,7 @@ services: volumes: - ./containers/data/paper:/data - ./ansible/files/paper-config:/config - - ./ansible/files/paper-plugins:/plugins + - ./ansible/build/paper-plugins:/plugins ################# ### Databases ###