Skip to content

Commit

Permalink
Update compose files (using override for awstats/default)
Browse files Browse the repository at this point in the history
  • Loading branch information
chbrandt committed Nov 21, 2021
1 parent 6c93880 commit 40cc387
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 36 deletions.
31 changes: 0 additions & 31 deletions dockerfiles/docker-compose.awstats.yml

This file was deleted.

4 changes: 2 additions & 2 deletions dockerfiles/docker-compose.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
ports:
- 8080:8080
volumes:
- "${DACHS_LOGS_PATH:-./logs/dachs}:/var/gavo/logs"
- "${DACHS_LOGS_PATH:-./tmp/logs}:/var/gavo/logs"

awstats:
container_name: awstats
Expand All @@ -44,4 +44,4 @@ services:
ports:
- 80:80
volumes:
- "${DACHS_LOGS_PATH:-./logs/dachs}:/var/gavo/logs:ro"
- "${DACHS_LOGS_PATH:-./tmp/logs}:/var/gavo/logs:ro"
17 changes: 17 additions & 0 deletions dockerfiles/docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: '3'

services:

awstats:
container_name: awstats
image: awstats:dachs
depends_on:
- dachs
build:
context: ./awstats
tty: true
network_mode: 'bridge'
ports:
- 80:80
volumes:
- "${DACHS_LOGS_PATH:-./tmp/logs}:/var/gavo/logs:ro"
1 change: 0 additions & 1 deletion dockerfiles/docker-compose.yml

This file was deleted.

17 changes: 17 additions & 0 deletions dockerfiles/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: '3'

services:

dachs:
container_name: dachs
image: gavodachs/dachs:latest
build:
context: ./dachs
args:
INSTALL_REPO: "${INSTALL_REPO}" # Builds 'stable' if not defined.
tty: true
network_mode: 'bridge'
ports:
- 8080:8080
volumes:
- "${DACHS_LOGS_PATH:-./tmp/logs}:/var/gavo/logs"
4 changes: 2 additions & 2 deletions dockerfiles/env.rc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Local path for Dachs logs (persistence)
DACHS_LOGS_PATH="./logs/dachs"
DACHS_LOGS_PATH="./tmp/logs"

# Dachs branch/repository version.
# Options are: stable, backports, beta.
INSTALL_REPO=backports
INSTALL_REPO=latest

# PostgreSQL version to build containers
PG_VERSION=13

0 comments on commit 40cc387

Please sign in to comment.