From 303283f73e3fc30ab896576beee25327d0d5dd81 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 19 Apr 2020 21:42:57 +0100 Subject: [PATCH] Remove portainer --- .../docker/files/portainer/docker-compose.yml | 16 ---------- ansible/roles/docker/tasks/main.yml | 3 -- ansible/roles/docker/tasks/portainer.yml | 29 ------------------- ansible/roles/docker/vars/pihole.yml | 1 - terraform/jakehoward.tech.tf | 8 ----- 5 files changed, 57 deletions(-) delete mode 100644 ansible/roles/docker/files/portainer/docker-compose.yml delete mode 100644 ansible/roles/docker/tasks/portainer.yml diff --git a/ansible/roles/docker/files/portainer/docker-compose.yml b/ansible/roles/docker/files/portainer/docker-compose.yml deleted file mode 100644 index 0ced700..0000000 --- a/ansible/roles/docker/files/portainer/docker-compose.yml +++ /dev/null @@ -1,16 +0,0 @@ -version: "2.3" - -services: - portainer: - image: portainer/portainer:latest - container_name: portainer - restart: unless-stopped - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./data:/data - labels: - - "traefik.enable=true" - - "traefik.http.routers.portainer.rule=Host(`portainer.jakehoward.tech`)" - - "traefik.http.routers.portainer.tls=true" - - "traefik.http.routers.portainer.tls.certresolver=le" - - "traefik.http.routers.portainer.middlewares=internal-only@file" diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 757f970..9e36e19 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -36,9 +36,6 @@ - name: Install pihole include: pihole.yml -- name: Install portainer - include: portainer.yml - - name: Install quassel include: quassel.yml diff --git a/ansible/roles/docker/tasks/portainer.yml b/ansible/roles/docker/tasks/portainer.yml deleted file mode 100644 index 6a330f2..0000000 --- a/ansible/roles/docker/tasks/portainer.yml +++ /dev/null @@ -1,29 +0,0 @@ -- name: Create portainer directory - file: - path: /opt/portainer - state: directory - owner: "{{ docker_user.name }}" - mode: "{{ docker_compose_directory_mask }}" - become: true - -- name: Install portainer compose file - template: - src: files/portainer/docker-compose.yml - dest: /opt/portainer/docker-compose.yml - mode: "{{ docker_compose_file_mask }}" - owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config - register: compose_file - become: true - -- name: Cycle portainer container - docker_compose: - project_src: /opt/portainer - pull: true - remove_orphans: true - remove_volumes: true - state: "{{ item }}" - when: compose_file.changed - loop: - - absent - - present diff --git a/ansible/roles/docker/vars/pihole.yml b/ansible/roles/docker/vars/pihole.yml index 8ca7bed..91d71c5 100644 --- a/ansible/roles/docker/vars/pihole.yml +++ b/ansible/roles/docker/vars/pihole.yml @@ -1,7 +1,6 @@ internal_hostnames: - duplicati.jakehoward.tech - traefik.jakehoward.tech - - portainer.jakehoward.tech - netdata.jakehoward.tech - deluge.jakehoward.tech - speed.jakehoward.tech diff --git a/terraform/jakehoward.tech.tf b/terraform/jakehoward.tech.tf index e75169a..d024dea 100644 --- a/terraform/jakehoward.tech.tf +++ b/terraform/jakehoward.tech.tf @@ -92,14 +92,6 @@ resource "cloudflare_record" "jakehowardtech_quassel" { ttl = 1 } -resource "cloudflare_record" "jakehowardtech_portainer" { - zone_id = cloudflare_zone.jakehowardtech.id - name = "portainer" - value = vultr_server.casey.main_ip - type = "A" - ttl = 1 -} - resource "cloudflare_record" "jakehowardtech_pihole" { zone_id = cloudflare_zone.jakehowardtech.id name = "pihole"