diff --git a/dockerfiles/docker-compose.awstats.yml b/dockerfiles/docker-compose.awstats.yml deleted file mode 100644 index 5ccebd2..0000000 --- a/dockerfiles/docker-compose.awstats.yml +++ /dev/null @@ -1,31 +0,0 @@ -version: '3' - -services: - - dachs: - container_name: dachs - image: 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:-./logs/dachs}:/var/gavo/logs" - - awstats: - container_name: awstats - image: dachs:awstats - depends_on: - - dachs - build: - context: ./awstats - tty: true - network_mode: 'bridge' - ports: - - 80:80 - volumes: - - "${DACHS_LOGS_PATH:-./logs/dachs}:/var/gavo/logs:ro" diff --git a/dockerfiles/docker-compose.full.yml b/dockerfiles/docker-compose.full.yml index e0b5750..daf80d1 100644 --- a/dockerfiles/docker-compose.full.yml +++ b/dockerfiles/docker-compose.full.yml @@ -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 @@ -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" diff --git a/dockerfiles/docker-compose.override.yml b/dockerfiles/docker-compose.override.yml new file mode 100644 index 0000000..2fc0cb3 --- /dev/null +++ b/dockerfiles/docker-compose.override.yml @@ -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" diff --git a/dockerfiles/docker-compose.yml b/dockerfiles/docker-compose.yml deleted file mode 120000 index 3832aa0..0000000 --- a/dockerfiles/docker-compose.yml +++ /dev/null @@ -1 +0,0 @@ -docker-compose.awstats.yml \ No newline at end of file diff --git a/dockerfiles/docker-compose.yml b/dockerfiles/docker-compose.yml new file mode 100644 index 0000000..828fc4c --- /dev/null +++ b/dockerfiles/docker-compose.yml @@ -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" diff --git a/dockerfiles/env.rc b/dockerfiles/env.rc index 3df7f16..0a67936 100644 --- a/dockerfiles/env.rc +++ b/dockerfiles/env.rc @@ -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