From 273193db8994c3440cff748ffc1c607db960d857 Mon Sep 17 00:00:00 2001
From: ts19084 <thomas.schauer-koeckeis@stud.th-deg.de>
Date: Wed, 12 Mar 2025 14:38:59 +0100
Subject: [PATCH] Works
---
docker-compose.yaml | 5 +++++
upgrade_not_a_virus.sh | 6 +-----
web.Dockerfile | 5 ++++-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a44ced7..350dcb1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -16,6 +16,11 @@ services:
networks:
repo-network:
ipv4_address: 172.20.0.11
+ depends_on:
+ website:
+ condition: service_started
+
+
networks:
repo-network:
diff --git a/upgrade_not_a_virus.sh b/upgrade_not_a_virus.sh
index c867fcd..411a7c9 100644
--- a/upgrade_not_a_virus.sh
+++ b/upgrade_not_a_virus.sh
@@ -1,9 +1,5 @@
sleep 20
-su max
-cd /build/not_a_virus2.0
-makepkg -s --noconfirm
-
-mv your-package-*.pkg.tar.zst /repo/
+mv /build/not_a_virus2.0/*.pkg.tar.zst /repo/.
repo-add /repo/mypkgs.db.tar.gz /repo/*.pkg.tar.zst
diff --git a/web.Dockerfile b/web.Dockerfile
index cf34ac0..78373ba 100644
--- a/web.Dockerfile
+++ b/web.Dockerfile
@@ -9,8 +9,11 @@ COPY ./files/ /build/
RUN useradd -m max && chown -R max:max /build
RUN echo "max ALL=(ALL:ALL) NOPASSWD: ALL" >> /etc/sudoers
USER max
-WORKDIR /build/not_a_virus1.0
+WORKDIR /build/not_a_virus2.0
+RUN makepkg -s --noconfirm
+
+WORKDIR /build/not_a_virus1.0
RUN tar -czf default_package.tar.gz default_package/
RUN makepkg -s --noconfirm
--
GitLab