Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-09-21 21:40:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mount the mandatory config files separately in docker-compose, since it's including the whole /app from host and therefore the copies made in Dockerfile aren't available.

Browse source
This commit is contained in:
Jyri-Petteri Paloposki 2020-07-19 21:44:43 +03:00
parent 85e104006c
commit 869bf2a9fd
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docker-compose.yml
View file

@ -13,7 +13,9 @@ services:
DATABASE_USERNAME: root DATABASE_USERNAME: root
DATABASE_PASSWORD_EMPTY: 1 DATABASE_PASSWORD_EMPTY: 1
volumes: volumes:
- ${VOLUME:-.:/app}:Z - ${VOLUME:-.}:/app:Z
- ${VOLUME:-.}/config/database.docker.yml:/app/config/database.yml:Z
- ${VOLUME:-.}/config/site.docker.yml:/app/config/site.yml:Z
ports: ports:
- 3000:3000 - 3000:3000
depends_on: depends_on:

4
script/docker-environment
View file

@ -2,12 +2,14 @@
set -e set -e
echo "Doing it here"
# Find our app dir # Find our app dir
appdir=$(cd $(dirname "$0")/.. && pwd) appdir=$(cd $(dirname "$0")/.. && pwd)
# Check if we've been told to run the command in Docker Composer. # Check if we've been told to run the command in Docker Composer.
cmd="$@"; [ "$#" -eq 0 ] && cmd=bash cmd="$@"; [ "$#" -eq 0 ] && cmd=bash
export VOLUME="$appdir:/app" export VOLUME="$appdir"
image=${DOCKER_IMAGE:=web} image=${DOCKER_IMAGE:=web}
port_publish=""; [ "${BIND_DOCKER_SERVICE_PORTS:-}" = 1 ] && port_publish="--service-ports" port_publish=""; [ "${BIND_DOCKER_SERVICE_PORTS:-}" = 1 ] && port_publish="--service-ports"