From 0007eefa5468ff08c1641ef8b620d4ff284fe1a2 Mon Sep 17 00:00:00 2001
From: JMARyA <jmarya@hydrar.de>
Date: Thu, 17 Apr 2025 13:39:34 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=91=EF=B8=8F=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.woodpecker/build.yml | 6 ++++++
Dockerfile | 9 +--------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index a1c30f0..095bf10 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -3,6 +3,12 @@ when:
branch: main
steps:
+ - name: pacstrap
+ image: git.hydrar.de/navos/navos:latest
+ privileged: true
+ commands:
+ - pacman -Syu --noconfirm && pacman -S --noconfirm navinstall && yes | pacman -Scc
+ - mkdir os && navinstall create-tar os
- name: build
image: woodpeckerci/plugin-docker-buildx
settings:
diff --git a/Dockerfile b/Dockerfile
index faa66b6..f37998e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,3 @@
-FROM git.hydrar.de/navos/navos:latest AS builder
-
-COPY ./pacman.conf /pacman.conf
-RUN pacman -Syu --noconfirm && pacman -S --noconfirm navinstall && yes | pacman -Scc
-
-RUN mkdir /os && navinstall create-tar /os
-
FROM scratch
-COPY --from=builder /os/ /
+COPY --from=builder ./os/ /
CMD ["/bin/sh"]
\ No newline at end of file