Compare commits

..

No commits in common. "171fe7355c14e24e3bc34c705341454933d12541" and "e1a136ff51f1cfb29428644caf1b680c5521cde2" have entirely different histories.

4 changed files with 3 additions and 11 deletions

View file

@ -18,7 +18,7 @@ RUN useradd --create-home --home-dir /gorb gorb
USER gorb USER gorb
ENV WEB_URL=http://localhost:8080 \ ENV URL=http://localhost:8080 \
DATABASE_USERNAME=gorb \ DATABASE_USERNAME=gorb \
DATABASE_PASSWORD=gorb \ DATABASE_PASSWORD=gorb \
DATABASE=gorb \ DATABASE=gorb \

View file

@ -19,7 +19,7 @@ services:
environment: environment:
#- RUST_LOG=debug #- RUST_LOG=debug
# This should be changed to the public URL of the server! # This should be changed to the public URL of the server!
- WEB_URL=http://localhost:8080 - URL=http://localhost:8080
- DATABASE_USERNAME=gorb - DATABASE_USERNAME=gorb
- DATABASE_PASSWORD=gorb - DATABASE_PASSWORD=gorb
- DATABASE=gorb - DATABASE=gorb

View file

@ -17,7 +17,7 @@ services:
environment: environment:
#- RUST_LOG=debug #- RUST_LOG=debug
# This should be changed to the public URL of the server! # This should be changed to the public URL of the server!
- WEB_URL=http://localhost:8080 - URL=http://localhost:8080
- DATABASE_USERNAME=gorb - DATABASE_USERNAME=gorb
- DATABASE_PASSWORD=gorb - DATABASE_PASSWORD=gorb
- DATABASE=gorb - DATABASE=gorb

View file

@ -14,9 +14,6 @@ fi
if [ ! -f "/gorb/config/config.toml" ]; then if [ ! -f "/gorb/config/config.toml" ]; then
cat > /gorb/config/config.toml <<EOF cat > /gorb/config/config.toml <<EOF
[web]
url = "${WEB_URL}"
[database] [database]
username = "${DATABASE_USERNAME}" username = "${DATABASE_USERNAME}"
password = "${DATABASE_PASSWORD}" password = "${DATABASE_PASSWORD}"
@ -28,11 +25,6 @@ port = ${DATABASE_PORT}
host = "${CACHE_DB_HOST}" host = "${CACHE_DB_HOST}"
port = ${CACHE_DB_PORT} port = ${CACHE_DB_PORT}
EOF
fi
if [ -n "${BUNNY_API_KEY}" ] && ! grep -q "^\[bunny\]" "/gorb/config/config.toml"; then
cat >> "/gorb/config/config.toml" <<EOF
[bunny] [bunny]
api_key = "${BUNNY_API_KEY}" api_key = "${BUNNY_API_KEY}"
endpoint = "${BUNNY_ENDPOINT}" endpoint = "${BUNNY_ENDPOINT}"