Skip to content

Commit

Permalink
Add a override compose file with the development settings
Browse files Browse the repository at this point in the history
  • Loading branch information
juanluisbaptiste committed Dec 17, 2020
1 parent b230bd7 commit 30f596e
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
23 changes: 23 additions & 0 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
version: '3'

services:
otrs:
image: juanluisbaptiste/otrs:dev
build: otrs
mariadb:
image: juanluisbaptiste/otrs-mariadb:dev
build: mariadb
adminer:
image: adminer:standalone
read_only: true
volumes:
- /tmp
ports:
- "8080:8080"
# networks:
# - internal
# - proxy
depends_on:
- mariadb
links:
- mariadb
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ version: '3'
services:
otrs:
image: juanluisbaptiste/otrs:latest
build: otrs
ports:
- '80:80'
# If running behind a proxy container, expose the ports instead
Expand All @@ -25,7 +24,6 @@ services:
- '/etc/localtime:/etc/localtime:ro'
mariadb:
image: juanluisbaptiste/otrs-mariadb:latest
build: mariadb
expose:
- "3306"
env_file: .env
Expand Down
3 changes: 2 additions & 1 deletion launch-testing.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ if [ ${CLEAN} -eq 1 ]; then
fi

if [ ${BUILD_IMAGE} -eq 1 ]; then
docker-compose -f ${COMPOSE_FILE} build ${BUILD_NOCACHE}
docker-compose build ${BUILD_NOCACHE}

if [ $? -gt 0 ]; then
out=$(echo ${out}|tail -n 10)
notify-send 'App rebuild failure' "There was an error building the container, see console for build output" -t ${NOTIFY_TIMEOUT} -i dialog-error && \
Expand Down

0 comments on commit 30f596e

Please sign in to comment.