diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3cf5d68 --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +* +!gitea/ +!ghost/ +!nextcloud/ +!standardfile/ +!ttrss/ +!funkwhale/ +!mediawiki/ +!**/docker-compose.yml +!**/Dockerfile +!.gitignore diff --git a/standardfile b/standardfile deleted file mode 160000 index 38cd3a6..0000000 --- a/standardfile +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 38cd3a6f31d78d1115760ca0905b156082ea3266 diff --git a/ttrss/docker-compose.yml b/ttrss/docker-compose.yml index e309019..b35efa0 100644 --- a/ttrss/docker-compose.yml +++ b/ttrss/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: ttrss: - image: x86dev/docker-ttrss + image: docker-ttrss container_name: ttrss restart: always environment: @@ -15,16 +15,19 @@ services: - DB_PORT=5432 - DB_TYPE=pgsql ports: - - "8181:8080" + - "8080:8080" depends_on: - ttrssdb ttrssdb: - image: nornagon/postgres + image: postgres:alpine container_name: ttrssdb restart: always + environment: + - POSTGRES_USER=docker + - POSTGRES_PASSWORD=docker expose: - "5432" volumes: - - ttrssdb:/var/lib/postgresql/9.3/main + - ttrssdb:/var/lib/postgresql/data volumes: ttrssdb: