diff --git a/docker-compose.yaml b/docker-compose.yaml index a44ced79922f2cb196866de4baef06b1fb097e7d..350dcb13a0386ae721b49db9608bf4ae762dea3f 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 c867fcd895ac5002fafc94a167e1696091921d73..411a7c9d64788633247aa5700b7bcb206517ded9 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 cf34ac0934dc3faaa9b34935fd28fa0d0cf53ab1..78373bad6229fe75776db5ba49e75ef7056a6c44 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