From 3ba4ec5dadf3398cdff9b50fb18347f57c70eeb1 Mon Sep 17 00:00:00 2001 From: Asara Date: Sat, 25 Jun 2022 10:19:15 -0400 Subject: [PATCH] update versions, point everything to new docker repo --- ansible/group_vars/all/main.yml | 10 +++++----- ansible/group_vars/hardtack/main.yml | 2 +- ansible/host_vars/redwingcherokee.minhas.io/main.yml | 2 +- ansible/inventory.txt | 2 +- ansible/roles/k3s/handlers/main.yml | 5 +++++ ansible/roles/k3s/tasks/get_k3s.yml | 7 +++++++ ansible/roles/nomad_client/tasks/main.yml | 1 - docker/nextcloud/Dockerfile | 2 +- docker/wallabag/Dockerfile | 2 +- nomad/freshrss.nomad | 2 +- nomad/gitea.nomad | 2 +- nomad/nextcloud.nomad | 2 +- nomad/sudoscientist-go-backend.nomad | 2 +- nomad/wallabag.nomad | 2 +- 14 files changed, 27 insertions(+), 16 deletions(-) create mode 100644 ansible/roles/k3s/handlers/main.yml diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml index b175bc4..723d6d5 100644 --- a/ansible/group_vars/all/main.yml +++ b/ansible/group_vars/all/main.yml @@ -7,11 +7,11 @@ admin_email_address: amarpreet@minhas.io hashi_arch: amd64 # consul -consul_version: 1.10.1 +consul_version: 1.12.2 consul_domain: masked.name # vault -vault_version: 1.8.1 +vault_version: 1.10.4 vault_pki_policy: masked-dot-name vault_ca_cert_name: MaskedName_Root_CA.crt vault_ca_cert_payload: | @@ -60,12 +60,12 @@ vault_ca_cert_payload: | -----END CERTIFICATE----- # nomad -nomad_version: 1.1.3 +nomad_version: 1.3.1 nomad_podman_driver_version: 0.3.0 # lnd -lnd_version: 0.14.2-beta +lnd_version: 0.15.0-beta # lego -lego_version: 4.4.0 +lego_version: 4.7.0 ... diff --git a/ansible/group_vars/hardtack/main.yml b/ansible/group_vars/hardtack/main.yml index 62a36e2..9e62a5b 100644 --- a/ansible/group_vars/hardtack/main.yml +++ b/ansible/group_vars/hardtack/main.yml @@ -3,5 +3,5 @@ hashi_arch: arm consul_arch: arm64 nomad_arch: arm64 docker_arch: arm64 -k3s_version: v1.23.4+k3s1 +k3s_version: v1.24.1+k3s1 k3s_role: 'client' diff --git a/ansible/host_vars/redwingcherokee.minhas.io/main.yml b/ansible/host_vars/redwingcherokee.minhas.io/main.yml index 6c91240..81f7c9d 100644 --- a/ansible/host_vars/redwingcherokee.minhas.io/main.yml +++ b/ansible/host_vars/redwingcherokee.minhas.io/main.yml @@ -1,6 +1,6 @@ --- hashi_arch: arm -consul_arch: armhfv6 +consul_arch: arm lnd_arch: armv7 bitcoind_disk: /dev/sda1 diff --git a/ansible/inventory.txt b/ansible/inventory.txt index 76a113d..0caafba 100644 --- a/ansible/inventory.txt +++ b/ansible/inventory.txt @@ -23,7 +23,7 @@ hardtack[1:7].minhas.io [lnd] redwingcherokee.minhas.io -[nexus] +[docker-repo] ivyking.minhas.io [nomad_client] diff --git a/ansible/roles/k3s/handlers/main.yml b/ansible/roles/k3s/handlers/main.yml new file mode 100644 index 0000000..4557eb3 --- /dev/null +++ b/ansible/roles/k3s/handlers/main.yml @@ -0,0 +1,5 @@ +--- +- name: restart k3s + systemd: + name: k3s + state: restarted diff --git a/ansible/roles/k3s/tasks/get_k3s.yml b/ansible/roles/k3s/tasks/get_k3s.yml index 21abf0a..4a5178f 100644 --- a/ansible/roles/k3s/tasks/get_k3s.yml +++ b/ansible/roles/k3s/tasks/get_k3s.yml @@ -1,4 +1,10 @@ --- +- name: get dependencies + apt: + name: + - apparmor + - apparmor-utils + - name: check k3s version shell: cmd: "k3s --version | grep k3s | cut -d' ' -f3" @@ -16,6 +22,7 @@ owner: root group: root when: installed_k3s_version.stdout != k3s_version + notify: restart k3s - name: link k3s file: diff --git a/ansible/roles/nomad_client/tasks/main.yml b/ansible/roles/nomad_client/tasks/main.yml index c776421..88eb79f 100644 --- a/ansible/roles/nomad_client/tasks/main.yml +++ b/ansible/roles/nomad_client/tasks/main.yml @@ -1,5 +1,4 @@ --- -- import_tasks: podman.yml - import_tasks: nomad.yml - import_tasks: client_setup.yml ... diff --git a/docker/nextcloud/Dockerfile b/docker/nextcloud/Dockerfile index dd9d1ad..d3e4fd1 100644 --- a/docker/nextcloud/Dockerfile +++ b/docker/nextcloud/Dockerfile @@ -1,4 +1,4 @@ -FROM nextcloud:23.0-apache +FROM nextcloud:24.0-apache # Copy masked.name root cert COPY files/MaskedName_Root_CA.crt /usr/local/share/ca-certificates/MaskedName_Root_CA.crt diff --git a/docker/wallabag/Dockerfile b/docker/wallabag/Dockerfile index 80666d5..2835c0e 100644 --- a/docker/wallabag/Dockerfile +++ b/docker/wallabag/Dockerfile @@ -1,4 +1,4 @@ -FROM wallabag/wallabag:2.4.2 +FROM wallabag/wallabag:2.5.1 # add ca-certificates package RUN apk add --no-cache ca-certificates diff --git a/nomad/freshrss.nomad b/nomad/freshrss.nomad index 6bd9f5d..451239c 100644 --- a/nomad/freshrss.nomad +++ b/nomad/freshrss.nomad @@ -23,7 +23,7 @@ job "freshrss" { } driver = "docker" config { - image = "docker.service.masked.name:8082/freshrss" + image = "docker-repo.service.masked.name:5000/freshrss" ports = ["http"] volumes = [ "/mnt/raid/rss:/var/www/FreshRSS/data" diff --git a/nomad/gitea.nomad b/nomad/gitea.nomad index 13a0444..366e914 100644 --- a/nomad/gitea.nomad +++ b/nomad/gitea.nomad @@ -23,7 +23,7 @@ job "gitea" { } driver = "docker" config { - image = "docker.service.masked.name:8082/gitea:latest" + image = "docker-repo.service.masked.name:5000/gitea:latest" ports = ["http"] volumes = [ "/mnt/raid/gitea:/data" diff --git a/nomad/nextcloud.nomad b/nomad/nextcloud.nomad index 254beb8..3b5a2bf 100644 --- a/nomad/nextcloud.nomad +++ b/nomad/nextcloud.nomad @@ -23,7 +23,7 @@ job "nextcloud" { } driver = "docker" config { - image = "docker.service.masked.name:8082/nextcloud:latest" + image = "docker-repo.service.masked.name:5000/nextcloud:latest" ports = ["nextcloud"] volumes = [ "/mnt/raid/nextcloud/:/var/www/html" diff --git a/nomad/sudoscientist-go-backend.nomad b/nomad/sudoscientist-go-backend.nomad index a26f231..d72b135 100644 --- a/nomad/sudoscientist-go-backend.nomad +++ b/nomad/sudoscientist-go-backend.nomad @@ -24,7 +24,7 @@ job "sudoscientist-go-backend" { } driver = "docker" config { - image = "docker.service.masked.name:8082/sudoscientist-go-backend" + image = "docker-repo.service.masked.name:5000/sudoscientist-go-backend" ports = ["http"] } diff --git a/nomad/wallabag.nomad b/nomad/wallabag.nomad index c6607fb..f8c738b 100644 --- a/nomad/wallabag.nomad +++ b/nomad/wallabag.nomad @@ -18,7 +18,7 @@ job "wallabag" { } driver = "docker" config { - image = "docker.service.masked.name:8082/wallabag" + image = "docker-repo.service.masked.name:5000/wallabag" ports = ["http"] }