update versions, point everything to new docker repo

This commit is contained in:
Amarpreet Minhas 2022-06-25 10:19:15 -04:00
parent 38b2f1c661
commit 3ba4ec5dad
14 changed files with 27 additions and 16 deletions

View file

@ -7,11 +7,11 @@ admin_email_address: amarpreet@minhas.io
hashi_arch: amd64 hashi_arch: amd64
# consul # consul
consul_version: 1.10.1 consul_version: 1.12.2
consul_domain: masked.name consul_domain: masked.name
# vault # vault
vault_version: 1.8.1 vault_version: 1.10.4
vault_pki_policy: masked-dot-name vault_pki_policy: masked-dot-name
vault_ca_cert_name: MaskedName_Root_CA.crt vault_ca_cert_name: MaskedName_Root_CA.crt
vault_ca_cert_payload: | vault_ca_cert_payload: |
@ -60,12 +60,12 @@ vault_ca_cert_payload: |
-----END CERTIFICATE----- -----END CERTIFICATE-----
# nomad # nomad
nomad_version: 1.1.3 nomad_version: 1.3.1
nomad_podman_driver_version: 0.3.0 nomad_podman_driver_version: 0.3.0
# lnd # lnd
lnd_version: 0.14.2-beta lnd_version: 0.15.0-beta
# lego # lego
lego_version: 4.4.0 lego_version: 4.7.0
... ...

View file

@ -3,5 +3,5 @@ hashi_arch: arm
consul_arch: arm64 consul_arch: arm64
nomad_arch: arm64 nomad_arch: arm64
docker_arch: arm64 docker_arch: arm64
k3s_version: v1.23.4+k3s1 k3s_version: v1.24.1+k3s1
k3s_role: 'client' k3s_role: 'client'

View file

@ -1,6 +1,6 @@
--- ---
hashi_arch: arm hashi_arch: arm
consul_arch: armhfv6 consul_arch: arm
lnd_arch: armv7 lnd_arch: armv7
bitcoind_disk: /dev/sda1 bitcoind_disk: /dev/sda1

View file

@ -23,7 +23,7 @@ hardtack[1:7].minhas.io
[lnd] [lnd]
redwingcherokee.minhas.io redwingcherokee.minhas.io
[nexus] [docker-repo]
ivyking.minhas.io ivyking.minhas.io
[nomad_client] [nomad_client]

View file

@ -0,0 +1,5 @@
---
- name: restart k3s
systemd:
name: k3s
state: restarted

View file

@ -1,4 +1,10 @@
--- ---
- name: get dependencies
apt:
name:
- apparmor
- apparmor-utils
- name: check k3s version - name: check k3s version
shell: shell:
cmd: "k3s --version | grep k3s | cut -d' ' -f3" cmd: "k3s --version | grep k3s | cut -d' ' -f3"
@ -16,6 +22,7 @@
owner: root owner: root
group: root group: root
when: installed_k3s_version.stdout != k3s_version when: installed_k3s_version.stdout != k3s_version
notify: restart k3s
- name: link k3s - name: link k3s
file: file:

View file

@ -1,5 +1,4 @@
--- ---
- import_tasks: podman.yml
- import_tasks: nomad.yml - import_tasks: nomad.yml
- import_tasks: client_setup.yml - import_tasks: client_setup.yml
... ...

View file

@ -1,4 +1,4 @@
FROM nextcloud:23.0-apache FROM nextcloud:24.0-apache
# Copy masked.name root cert # Copy masked.name root cert
COPY files/MaskedName_Root_CA.crt /usr/local/share/ca-certificates/MaskedName_Root_CA.crt COPY files/MaskedName_Root_CA.crt /usr/local/share/ca-certificates/MaskedName_Root_CA.crt

View file

@ -1,4 +1,4 @@
FROM wallabag/wallabag:2.4.2 FROM wallabag/wallabag:2.5.1
# add ca-certificates package # add ca-certificates package
RUN apk add --no-cache ca-certificates RUN apk add --no-cache ca-certificates

View file

@ -23,7 +23,7 @@ job "freshrss" {
} }
driver = "docker" driver = "docker"
config { config {
image = "docker.service.masked.name:8082/freshrss" image = "docker-repo.service.masked.name:5000/freshrss"
ports = ["http"] ports = ["http"]
volumes = [ volumes = [
"/mnt/raid/rss:/var/www/FreshRSS/data" "/mnt/raid/rss:/var/www/FreshRSS/data"

View file

@ -23,7 +23,7 @@ job "gitea" {
} }
driver = "docker" driver = "docker"
config { config {
image = "docker.service.masked.name:8082/gitea:latest" image = "docker-repo.service.masked.name:5000/gitea:latest"
ports = ["http"] ports = ["http"]
volumes = [ volumes = [
"/mnt/raid/gitea:/data" "/mnt/raid/gitea:/data"

View file

@ -23,7 +23,7 @@ job "nextcloud" {
} }
driver = "docker" driver = "docker"
config { config {
image = "docker.service.masked.name:8082/nextcloud:latest" image = "docker-repo.service.masked.name:5000/nextcloud:latest"
ports = ["nextcloud"] ports = ["nextcloud"]
volumes = [ volumes = [
"/mnt/raid/nextcloud/:/var/www/html" "/mnt/raid/nextcloud/:/var/www/html"

View file

@ -24,7 +24,7 @@ job "sudoscientist-go-backend" {
} }
driver = "docker" driver = "docker"
config { config {
image = "docker.service.masked.name:8082/sudoscientist-go-backend" image = "docker-repo.service.masked.name:5000/sudoscientist-go-backend"
ports = ["http"] ports = ["http"]
} }

View file

@ -18,7 +18,7 @@ job "wallabag" {
} }
driver = "docker" driver = "docker"
config { config {
image = "docker.service.masked.name:8082/wallabag" image = "docker-repo.service.masked.name:5000/wallabag"
ports = ["http"] ports = ["http"]
} }