From d16a948e1fa85704ab4a665a2e5cd73c7ebe0694 Mon Sep 17 00:00:00 2001 From: Mathieu Strypsteen Date: Mon, 4 Nov 2024 13:12:03 +0100 Subject: [PATCH] Update --- container-config/forgejo-runner/config.yaml | 1 - container-config/nginx-home/xmr | 1 + container-config/nginx/nginx.conf | 2 +- containers/big-agi/Containerfile | 2 +- containers/code-server/Containerfile | 4 ++-- home/etc/containers/systemd/big-agi.container | 2 ++ sandbox/etc/containers/systemd/forgejo-runner.container | 2 +- setup-laptop.sh | 2 +- setup-qubes-fedora.sh | 2 +- 9 files changed, 10 insertions(+), 8 deletions(-) diff --git a/container-config/forgejo-runner/config.yaml b/container-config/forgejo-runner/config.yaml index c22d313..5acf627 100644 --- a/container-config/forgejo-runner/config.yaml +++ b/container-config/forgejo-runner/config.yaml @@ -1,5 +1,4 @@ container: - docker_host: '-' options: --userns=host runner: labels: ["debian-12:docker://node:bookworm"] diff --git a/container-config/nginx-home/xmr b/container-config/nginx-home/xmr index a3b1987..cca9c0b 100644 --- a/container-config/nginx-home/xmr +++ b/container-config/nginx-home/xmr @@ -7,5 +7,6 @@ server { set $upstream home.server.home.arpa; proxy_pass http://$upstream:8012; include snippets/proxy.conf; + proxy_set_header Connection ""; } } diff --git a/container-config/nginx/nginx.conf b/container-config/nginx/nginx.conf index 67a438c..5c23351 100644 --- a/container-config/nginx/nginx.conf +++ b/container-config/nginx/nginx.conf @@ -23,7 +23,7 @@ http { error_log /dev/null; ssl_stapling on; ssl_stapling_verify on; - client_max_body_size 2G; + client_max_body_size 0; proxy_read_timeout 600; proxy_send_timeout 600; resolver host.containers.internal; diff --git a/containers/big-agi/Containerfile b/containers/big-agi/Containerfile index 9444bdf..96182c1 100644 --- a/containers/big-agi/Containerfile +++ b/containers/big-agi/Containerfile @@ -1,5 +1,5 @@ FROM registry.access.redhat.com/ubi9 AS builder -RUN curl -L https://github.com/enricoros/big-AGI/archive/refs/tags/v1.16.8.tar.gz | tar xz && mv big-AGI-* big-AGI +RUN curl -L https://github.com/enricoros/big-AGI/archive/refs/heads/v2-dev.tar.gz | tar xz && mv big-AGI-* big-AGI FROM registry.access.redhat.com/ubi9/nodejs-20-minimal ENV NEXT_TELEMETRY_DISABLED 1 COPY --from=builder /big-AGI . diff --git a/containers/code-server/Containerfile b/containers/code-server/Containerfile index bb7a77b..c6179ff 100644 --- a/containers/code-server/Containerfile +++ b/containers/code-server/Containerfile @@ -1,7 +1,7 @@ FROM quay.io/fedora/fedora-toolbox:41 RUN dnf up -y -RUN dnf install -y bash-color-prompt clang clang-tools-extra gcc hyperfine java-devel libvirt llvm mtools nodejs-npm openssl-devel parted poetry postgresql-server python3-ipykernel python3-pip qemu-system-x86-core rustup systemd-container vim-enhanced -RUN dnf install -y https://github.com/coder/code-server/releases/download/v4.93.1/code-server-4.93.1-amd64.rpm +RUN dnf install -y bash-color-prompt clang clang-tools-extra gcc hyperfine java-devel llvm mtools nodejs-npm openssl-devel parted poetry postgresql-server python3-pip qemu-system-x86-core rustup systemd-container vim-enhanced +RUN dnf install -y https://github.com/coder/code-server/releases/download/v4.94.2-rc.1/code-server-4.94.2-rc.1-amd64.rpm RUN mkdir /etc/systemd/system/user@.service.d RUN mkdir /var/lib/systemd/linger RUN touch /var/lib/systemd/linger/coder diff --git a/home/etc/containers/systemd/big-agi.container b/home/etc/containers/systemd/big-agi.container index cfdfee8..5a4abc1 100644 --- a/home/etc/containers/systemd/big-agi.container +++ b/home/etc/containers/systemd/big-agi.container @@ -4,7 +4,9 @@ Network=nginx.network Environment=HTTP_BASIC_AUTH_USERNAME=mathieu Environment=PUPPETEER_WSS_ENDPOINT=ws://sandbox.server.home.arpa:3000 Secret=HTTP_BASIC_AUTH_PASSWORD,type=env +Secret=GROQ_API_KEY,type=env Secret=OPENAI_API_KEY,type=env +Secret=OPENROUTER_API_KEY,type=env PublishPort=10.0.1.2:8004:3000 AutoUpdate=registry [Install] diff --git a/sandbox/etc/containers/systemd/forgejo-runner.container b/sandbox/etc/containers/systemd/forgejo-runner.container index 39b9e65..b217164 100644 --- a/sandbox/etc/containers/systemd/forgejo-runner.container +++ b/sandbox/etc/containers/systemd/forgejo-runner.container @@ -1,5 +1,5 @@ [Container] -Image=code.forgejo.org/forgejo/runner:3.5.1 +Image=code.forgejo.org/forgejo/runner:4.0.0 SecurityLabelDisable=true Exec=forgejo-runner daemon -c /etc/forgejo-runner/config.yaml Volume=/run/podman:/run/podman:U diff --git a/setup-laptop.sh b/setup-laptop.sh index e46e72b..1d460cd 100644 --- a/setup-laptop.sh +++ b/setup-laptop.sh @@ -5,4 +5,4 @@ sh setup-desktop.sh systemctl disable auditd systemctl mask --global grub-boot-success.timer flatpak remote-add --if-not-exists flathub /usr/lib/fedora-third-party/conf.d/fedora-flathub.flatpakrepo -flatpak install com.github.tchx84.Flatseal com.github.wwmm.easyeffects com.github.xournalpp.xournalpp com.moonlight_stream.Moonlight com.valvesoftware.Steam com.vscodium.codium com.yubico.yubioath io.mpv.Mpv net.lutris.Lutris org.chromium.Chromium org.gimp.GIMP org.gnome.Boxes org.gnome.Calculator org.gnome.Evince org.gnome.Evolution org.gnome.FileRoller org.gnome.Snapshot org.gnome.TextEditor org.libreoffice.LibreOffice org.mozilla.firefox org.remmina.Remmina org.torproject.torbrowser-launcher +flatpak install com.github.tchx84.Flatseal com.github.wwmm.easyeffects com.github.xournalpp.xournalpp com.moonlight_stream.Moonlight com.spotify.Client com.valvesoftware.Steam com.vscodium.codium com.yubico.yubioath im.riot.Riot io.mpv.Mpv net.lutris.Lutris org.chromium.Chromium org.gimp.GIMP org.gnome.Boxes org.gnome.Calculator org.gnome.Evince org.gnome.Evolution org.gnome.FileRoller org.gnome.Snapshot org.gnome.TextEditor org.libreoffice.LibreOffice org.mozilla.firefox org.remmina.Remmina org.torproject.torbrowser-launcher diff --git a/setup-qubes-fedora.sh b/setup-qubes-fedora.sh index 5054d22..1583249 100644 --- a/setup-qubes-fedora.sh +++ b/setup-qubes-fedora.sh @@ -6,4 +6,4 @@ dnf install --allowerasing bash-color-prompt bash-completion borgbackup bind-uti dnf remove cheese evolution-data-server firefox gnome-software gnome-weather PackageKit-command-not-found rpmfusion-nonfree-release thunderbird totem sh setup-desktop.sh all_proxy=127.0.0.1:8082 flatpak remote-add --if-not-exists flathub /usr/lib/fedora-third-party/conf.d/fedora-flathub.flatpakrepo -all_proxy=127.0.0.1:8082 flatpak install com.github.tchx84.Flatseal io.mpv.Mpv org.chromium.Chromium org.freedesktop.Platform.ffmpeg-full/x86_64/23.08 org.libreoffice.LibreOffice org.mozilla.firefox +all_proxy=127.0.0.1:8082 flatpak install com.github.tchx84.Flatseal im.riot.Riot io.mpv.Mpv org.chromium.Chromium org.freedesktop.Platform.ffmpeg-full/x86_64/23.08 org.libreoffice.LibreOffice org.mozilla.firefox