ソースを参照

docker fixes and nextcloud update

Christian Lempa 3 年 前
コミット
9d44fabd64

+ 1 - 21
ansible/provisoning/ubuntu/install-docker.yaml

@@ -10,27 +10,7 @@
   - name: install prerequisites
   - name: install prerequisites
     apt:
     apt:
       name:
       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
       update_cache: yes
 
 
   - name: add user permissions
   - name: add user permissions

+ 0 - 77
docker-compose/nextcloud/nextcloud-npm.yaml

@@ -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

+ 4 - 15
docker-compose/nextcloud/nextcloud.yaml

@@ -4,17 +4,11 @@ volumes:
   nextcloud-data:
   nextcloud-data:
   nextcloud-db:
   nextcloud-db:
 
 
-networks:
-  frontend:
-    # add this if the network is already existing!
-    # external: true
-  backend:
-
 services:
 services:
 
 
   nextcloud-app:
   nextcloud-app:
-    image: nextcloud
-    restart: always
+    image: nextcloud:latest
+    restart: unless-stopped
     volumes:
     volumes:
       - nextcloud-data:/var/www/html
       - nextcloud-data:/var/www/html
     environment:
     environment:
@@ -22,13 +16,10 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=nextcloud-db
       - MYSQL_HOST=nextcloud-db
-    networks:
-      - frontend
-      - backend
 
 
   nextcloud-db:
   nextcloud-db:
-    image: mariadb
-    restart: always
+    image: mariadb:latest
+    restart: unless-stopped
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
     command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
     volumes:
     volumes:
       - nextcloud-db:/var/lib/mysql
       - nextcloud-db:/var/lib/mysql
@@ -37,5 +28,3 @@ services:
       - MYSQL_PASSWORD=replace-with-secure-password
       - MYSQL_PASSWORD=replace-with-secure-password
       - MYSQL_DATABASE=nextcloud
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
       - MYSQL_USER=nextcloud
-    networks:
-      - backend