diff --git a/ansible/provisoning/ubuntu/install-docker.yaml b/ansible/provisoning/ubuntu/install-docker.yaml index 9165680..8f0cd66 100644 --- a/ansible/provisoning/ubuntu/install-docker.yaml +++ b/ansible/provisoning/ubuntu/install-docker.yaml @@ -10,27 +10,7 @@ - name: install prerequisites apt: name: - - apt-transport-https - - ca-certificates - - curl - - gnupg-agent - - software-properties-common - update_cache: yes - - - name: add apt-key - apt_key: - url: https://download.docker.com/linux/ubuntu/gpg - - - name: add docker repo - apt_repository: - repo: deb https://download.docker.com/linux/ubuntu focal stable - - - name: install docker - apt: - name: - - docker-ce - - docker-ce-cli - - containerd.io + - docker.io update_cache: yes - name: add user permissions diff --git a/docker-compose/nextcloud/nextcloud-npm.yaml b/docker-compose/nextcloud/nextcloud-npm.yaml deleted file mode 100644 index cd63791..0000000 --- a/docker-compose/nextcloud/nextcloud-npm.yaml +++ /dev/null @@ -1,77 +0,0 @@ -version: '3' - -volumes: - nextcloud-data: - nextcloud-db: - npm-data: - npm-ssl: - npm-db: - -networks: - frontend: - # add this if the network is already existing! - # external: true - backend: - -services: - - nextcloud-app: - image: nextcloud - restart: always - volumes: - - nextcloud-data:/var/www/html - environment: - - MYSQL_PASSWORD=replace-with-secure-password - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - - MYSQL_HOST=nextcloud-db - networks: - - frontend - - backend - - nextcloud-db: - image: mariadb - restart: always - command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW - volumes: - - nextcloud-db:/var/lib/mysql - environment: - - MYSQL_ROOT_PASSWORD=replace-with-secure-password - - MYSQL_PASSWORD=replace-with-secure-password - - MYSQL_DATABASE=nextcloud - - MYSQL_USER=nextcloud - networks: - - backend - - npm-app: - image: jc21/nginx-proxy-manager:latest - restart: always - ports: - - "80:80" - - "81:81" - - "443:443" - environment: - - DB_MYSQL_HOST=npm-db - - DB_MYSQL_PORT=3306 - - DB_MYSQL_USER=npm - - DB_MYSQL_PASSWORD=replace-with-secure-password - - DB_MYSQL_NAME=npm - volumes: - - npm-data:/data - - npm-ssl:/etc/letsencrypt - networks: - - frontend - - backend - - npm-db: - image: jc21/mariadb-aria:latest - restart: always - environment: - - MYSQL_ROOT_PASSWORD=replace-with-secure-password - - MYSQL_DATABASE=npm - - MYSQL_USER=npm - - MYSQL_PASSWORD=replace-with-secure-password - volumes: - - npm-db:/var/lib/mysql - networks: - - backend \ No newline at end of file diff --git a/docker-compose/nextcloud/nextcloud.yaml b/docker-compose/nextcloud/nextcloud.yaml index c65b3b3..89958a3 100644 --- a/docker-compose/nextcloud/nextcloud.yaml +++ b/docker-compose/nextcloud/nextcloud.yaml @@ -4,17 +4,11 @@ volumes: nextcloud-data: nextcloud-db: -networks: - frontend: - # add this if the network is already existing! - # external: true - backend: - services: nextcloud-app: - image: nextcloud - restart: always + image: nextcloud:latest + restart: unless-stopped volumes: - nextcloud-data:/var/www/html environment: @@ -22,13 +16,10 @@ services: - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - MYSQL_HOST=nextcloud-db - networks: - - frontend - - backend nextcloud-db: - image: mariadb - restart: always + image: mariadb:latest + restart: unless-stopped command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW volumes: - nextcloud-db:/var/lib/mysql @@ -37,5 +28,3 @@ services: - MYSQL_PASSWORD=replace-with-secure-password - MYSQL_DATABASE=nextcloud - MYSQL_USER=nextcloud - networks: - - backend \ No newline at end of file