Use /var/lib instead of docker volumes

ansible/misc-backup.yaml

@@ -1,50 +0,0 @@
----
-- hosts: misc
-  vars:
-    start_time: "{{ ansible_date_time.iso8601_basic_short }}"
-  tasks:
-    - name: Stop docker stuff
-      become: yes
-      docker_compose:
-        project_src: /etc/pbri/docker/web
-        state: present
-        stopped: yes
-    - name: Create backups in /etc/pbri/backups
-      become: yes
-      docker_container:
-        container_default_behavior: no_defaults
-        name: bacman
-        image: busybox
-        volumes:
-          - "{{ item }}:/data"
-          - "/etc/pbri/backups/{{ start_time }}:/backup"
-        command: "cp -r /data /backup/{{ item }}"
-        detach: no
-        cleanup: yes
-      loop:
-        - codi_database
-        - codi_uploads
-        - gitlab_data
-        - gitlab_logs
-        - gitlab_config
-    - name: Make tar
-      become: yes
-      shell:
-        cmd: "tar -czvf ../{{ start_time }}.tar.gz *"
-        chdir: "/etc/pbri/backups/{{ start_time }}"
-    - name: Download tar
-      become: yes
-      fetch:
-        src: /etc/pbri/backups/{{ start_time }}.tar.gz
-        dest: ../backups
-    - name: Remove backups folder
-      become: yes
-      file:
-        path: /etc/pbri/backups
-        state: absent
-    - name: Restart docker stuff
-      become: yes
-      docker_compose:
-        project_src: /etc/pbri/docker/web
-        state: present
-        restarted: yes

ansible/misc-docker.yaml

@@ -10,15 +10,13 @@
         mode: u=rw,g=,o=
         # Directories should be listable
         directory_mode: u=rwx,g=rx,o=rx
-    - name: Create global docker volumes (/var/lib)
+    - name: Create directory for docker volumes
       become: yes
       file:
-        path: "/var/lib/pbri/docker/{{ item.name }}"
+        path: /var/lib/pbri/docker
         state: directory
         # Hide contents from non-root users
-        mode: u=rw,g=,o=
-      loop:
-        - name: drone
+        mode: u=rwx,g=,o=
     - name: Create global docker volumes (docker_volume)
       become: yes
       docker_volume:
@@ -26,19 +24,19 @@
         state: "{{ item.state }}"
       loop:
         - name: codi_database
-          state: present
+          state: absent
         - name: codi_uploads
-          state: present
+          state: absent
         - name: gitlab_data
-          state: present
+          state: absent
         - name: gitlab_logs
-          state: present
+          state: absent
         - name: gitlab_config
-          state: present
+          state: absent
         - name: gitlab_runner_config
-          state: present
+          state: absent
         - name: gitlab_runner_cache
-          state: present
+          state: absent
     - name: Set up docker stuff
       become: yes
       docker_compose:

docker/web/docker-compose.yaml

@@ -9,8 +9,8 @@ services:
       - 80:80
       - 443:443
     volumes:
-      - caddy_data:/data
-      - caddy_config:/config
+      - /var/lib/pbri/docker/caddy_data:/data
+      - /var/lib/pbri/docker/caddy_config:/config
       - /home/paul/Sites:/srv:ro
     restart: always
 
@@ -30,7 +30,7 @@ services:
       - codi_db
       - codi_plantuml
     volumes:
-      - codi_uploads:/home/hackmd/app/public/uploads
+      - /var/lib/pbri/docker/codi_uploads:/home/hackmd/app/public/uploads
     restart: always
     
   codi_db:
@@ -39,7 +39,7 @@ services:
     # Must match CMD_DB_URL in codi.env
     env_file: codi_db.env
     volumes:
-      - codi_database:/var/lib/postgresql/data
+      - /var/lib/pbri/docker/codi_database:/var/lib/postgresql/data
     restart: always
   
   codi_plantuml:
@@ -51,9 +51,9 @@ services:
     ports:
       - "22:22"
     volumes:
-      - gitlab_data:/var/opt/gitlab
-      - gitlab_logs:/var/log/gitlab
-      - gitlab_config:/etc/gitlab
+      - /var/lib/pbri/docker/gitlab_data:/var/opt/gitlab
+      - /var/lib/pbri/docker/gitlab_logs:/var/log/gitlab
+      - /var/lib/pbri/docker/gitlab_config:/etc/gitlab
     restart: always
     # GITLAB_SMTP_PASSWORD
     env_file: gitlab.env
@@ -125,17 +125,3 @@ services:
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     restart: always
-
-volumes:
-  caddy_data:
-  caddy_config:
-  codi_uploads:
-    external: yes
-  codi_database:
-    external: yes
-  gitlab_data:
-    external: yes
-  gitlab_logs:
-    external: yes
-  gitlab_config:
-    external: yes