Docker: migrate repo, index and website to docker volumes

This commit is contained in:
Marko Korhonen 2024-02-24 01:03:40 +02:00
parent 944de98b4a
commit 064c285fcf
Signed by: FunctionalHacker
GPG key ID: A7F78BCB859CD890
3 changed files with 11 additions and 11 deletions

View file

@ -167,9 +167,6 @@ dst = "/etc/doas.conf"
src = "etc/flexo/flexo.toml" src = "etc/flexo/flexo.toml"
dst = "/etc/flexo/flexo.toml" dst = "/etc/flexo/flexo.toml"
[profiles.Network]
dotfiles = ["d_network", "f_networkd.conf"]
[profiles.Locale] [profiles.Locale]
dotfiles = ["f_locale.conf", "f_locale.gen"] dotfiles = ["f_locale.conf", "f_locale.gen"]
@ -207,10 +204,10 @@ dotfiles = [
"f_welcomemessage.conf", "f_welcomemessage.conf",
"f_flexo.toml", "f_flexo.toml",
] ]
include = ["Locale", "Pacman", "Network"] include = ["Locale", "Pacman"]
[profiles.Moria] [profiles.Moria]
include = ["Locale", "Pacman", "Network"] include = ["Locale", "Pacman"]
dotfiles = [ dotfiles = [
"f_99-sysctl.conf", "f_99-sysctl.conf",
"f_cmdline", "f_cmdline",

View file

@ -1,6 +1,9 @@
[volumes] [volumes]
data = {} data = {}
config = {} config = {}
wkd = {}
korhonen_cc = {}
index = {}
[volumes.nextcloud_config] [volumes.nextcloud_config]
external = true external = true
@ -12,13 +15,13 @@ restart = "unless-stopped"
ports = ["80:80", "443:443/tcp", "443:443/udp"] ports = ["80:80", "443:443/tcp", "443:443/udp"]
networks = ["proxy"] networks = ["proxy"]
volumes = [ volumes = [
"./Caddyfile:/etc/caddy/Caddyfile",
"data:/data", "data:/data",
"config:/config", "config:/config",
"wkd:/var/www/wkd",
"korhonen_cc:/var/www/korhonen.cc",
"index:/var/www/index.korhonen.cc",
"nextcloud_config:/var/www/nextcloud", "nextcloud_config:/var/www/nextcloud",
"/var/www/korhonen.cc:/var/www/korhonen.cc",
"/var/www/wkd:/var/www/wkd",
"/var/www/index.korhonen.cc:/var/www/index.korhonen.cc",
"./Caddyfile:/etc/caddy/Caddyfile",
] ]
environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"] environment = ["CLOUDFLARE_EMAIL", "CLOUDFLARE_API_TOKEN", "ACME_AGREE=true"]

View file

@ -10,7 +10,7 @@ LocalFileSigLevel = Optional
CacheDir = /var/cache/pacman/pkg CacheDir = /var/cache/pacman/pkg
{%@@ if profile == "Moria" @@%} {%@@ if profile == "Moria" @@%}
CleanMethod=KeepCurrent CleanMethod=KeepCurrent
CacheDir=/var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64 CacheDir= /var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/korhonen_aur/x86_64
{%@@ endif @@%} {%@@ endif @@%}
[core] [core]
@ -27,7 +27,7 @@ Include = /etc/pacman.d/mirrorlist
[korhonen_aur] [korhonen_aur]
{%@@ if profile == "Moria" @@%} {%@@ if profile == "Moria" @@%}
Server = file:///var/www/index.korhonen.cc/repo/arch_linux/$repo/$arch Server = file:///var/lib/docker/volumes/caddy_index/_data/repo/arch_linux/$repo/$arch
{%@@ else @@%} {%@@ else @@%}
Include = /etc/pacman.d/pacserve Include = /etc/pacman.d/pacserve
Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch Server = https://index.korhonen.cc/repo/arch_linux/$repo/$arch