Skip to content
Snippets Groups Projects
Commit 233b9e9c authored by David Trattnig's avatar David Trattnig
Browse files

Consolidate config naming scheme.

parent 0076972a
No related branches found
No related tags found
No related merge requests found
...@@ -11,4 +11,4 @@ env.list ...@@ -11,4 +11,4 @@ env.list
audio audio
python python
__pycache__ __pycache__
config/engine.docker.ini config/docker.engine.ini
...@@ -84,10 +84,12 @@ For production we recommend running Engine using Docker Compose. If you want to ...@@ -84,10 +84,12 @@ For production we recommend running Engine using Docker Compose. If you want to
## Using Docker ## Using Docker
If you only want to run the single Engine Docker container, you can do this in a few, simple steps. Before getting started copy the default configuration file to `config/engine.docker.ini`: If you only want to run a single Engine Docker container, you can do this in a few, simple steps.
Before getting started copy the default configuration file to `config/engine.docker.ini`:
```shell ```shell
cp config/sample-docker.engine.ini config/engine.docker.ini cp config/sample-docker.engine.ini config/docker.engine.ini
``` ```
You'll need update a few settings: You'll need update a few settings:
...@@ -95,13 +97,17 @@ You'll need update a few settings: ...@@ -95,13 +97,17 @@ You'll need update a few settings:
- The app secret `api_tank_secret` for connecting to [AURA Tank](https://gitlab.servus.at/aura/tank) - The app secret `api_tank_secret` for connecting to [AURA Tank](https://gitlab.servus.at/aura/tank)
- Also check the `ENV` variables defined in the `run.sh` script. - Also check the `ENV` variables defined in the `run.sh` script.
At the moment production deployment using Docker and Docker Compose is [*work in progress*](https://gitlab.servus.at/aura/meta/-/issues/56). For now, starting Engine in Docker requires you to do a local build first: At the moment production deployment using Docker and Docker Compose is [*work in progress*](https://gitlab.servus.at/aura/meta/-/issues/56).
If you would like to run the local codebase, starting Engine in Docker requires you to do a build first:
```shell ```shell
./run.sh docker:build ./run.sh docker:build
``` ```
After your build has finished start the Engine with: After your build has finished start the Engine with following command.
If no build is available it pulls the latest image from [Docker Hub](https://hub.docker.com/r/autoradio/engine).
```shell ```shell
./run.sh docker:dev ./run.sh docker:dev
......
#!/bin/bash #!/bin/bash
mode="engine" mode="dev"
docker="false" docker="false"
# #
...@@ -13,6 +13,7 @@ docker="false" ...@@ -13,6 +13,7 @@ docker="false"
# - recreate-database # - recreate-database
# - docker:dev # - docker:dev
# - docker:prod
# - docker:build # - docker:build
# - docker:push # - docker:push
# #
...@@ -77,12 +78,12 @@ if [[ $docker == "true" ]]; then ...@@ -77,12 +78,12 @@ if [[ $docker == "true" ]]; then
BASE_DIR=$(readlink -f .) BASE_DIR=$(readlink -f .)
echo "Absolute base dir: " $BASE_DIR echo "Absolute base dir: " $BASE_DIR
### Runs Engine Docker Container ### ### Runs Engine Docker Container (Local build for development, if n/a pull from Docker Hub) ###
if [[ $mode == "dev" ]]; then if [[ $mode == "dev" ]]; then
if [[ -z "${AURA_ENGINE_CONFIG_PATH}" ]]; then if [[ -z "${AURA_ENGINE_CONFIG_PATH}" ]]; then
AURA_ENGINE_CONFIG_PATH=$(readlink -f "${BASE_DIR}/config/engine.docker.ini") AURA_ENGINE_CONFIG_PATH=$(readlink -f "${BASE_DIR}/config/docker.engine.ini")
fi fi
if [[ -z "${AURA_ENGINE_SOCKET_DIR}" ]]; then if [[ -z "${AURA_ENGINE_SOCKET_DIR}" ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment