From ac5526de1cb3fd31a742013b688e538d3ab9e378 Mon Sep 17 00:00:00 2001
From: kamkow1 <kamkow256@gmail.com>
Date: Fri, 3 Apr 2026 21:21:46 +0200
Subject: [PATCH] aux Develop inside docker

---
 Dockerfile.deploy => Dockerfile |   3 ++-
 Dockerfile.localdev             |  14 --------------
 OVMF/OVMF_VARS.fd               | Bin 540672 -> 540672 bytes
 aux/docker_build.sh             |   3 +++
 aux/docker_devel.sh             |   8 +++++++-
 aux/qemu_amd64.sh               |   2 +-
 6 files changed, 13 insertions(+), 17 deletions(-)
 rename Dockerfile.deploy => Dockerfile (94%)
 delete mode 100644 Dockerfile.localdev
 create mode 100755 aux/docker_build.sh

diff --git a/Dockerfile.deploy b/Dockerfile
similarity index 94%
rename from Dockerfile.deploy
rename to Dockerfile
index af61288..1ca967c 100644
--- a/Dockerfile.deploy
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
+ENV NO_AT_BRIDGE=1
 
 RUN apt-get update
 
@@ -15,7 +16,7 @@ RUN  wget https://apt.llvm.org/llvm.sh -O /llvm.sh &&  chmod +x /llvm.sh &&  /ll
 RUN wget https://deb.nodesource.com/setup_20.x -O /setup_node.sh && chmod +x /setup_node.sh && /setup_node.sh
 
 RUN  apt-get install -y make rsync clang-21 clang-tools-21 llvm-21 bear lld xorriso \
-                        zip gnupg openssh-client nodejs git build-essential
+                        zip gnupg openssh-client nodejs git build-essential qemu-system
 
 RUN  ln -sf /usr/bin/clang-21 /usr/bin/clang && \
      ln -sf /usr/bin/clang-doc-21 /usr/bin/clang-doc && \
diff --git a/Dockerfile.localdev b/Dockerfile.localdev
deleted file mode 100644
index b6e7a95..0000000
--- a/Dockerfile.localdev
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:latest AS builder
-
-RUN apt-get update && apt-get -y install clang llvm lld make xorriso
-
-WORKDIR /usr/src/MOP3
-
-COPY . .
-
-ARG bt
-
-RUN ./aux/devel.sh $bt
-
-FROM scratch
-COPY --from=builder /usr/src/MOP3/mop3.iso /mop3.iso
diff --git a/OVMF/OVMF_VARS.fd b/OVMF/OVMF_VARS.fd
index 8cd0488b3df456b6bdb9ec90ca4a841195a875bf..09bd9524c9ad27c0dbc895126d9589e3b8143d43 100644
GIT binary patch
delta 95
zcmZo@P;3CAEsXa9CX4kbO;%WuustD=vC3`oyI`m7GBX&@ac+(?W@DLLpsBzpw|S!G
yS<daR7BW6!p6p<*GWkKbN&Cg6j6lq^{o+#Q7tw73ENud;Z31j<0_@8KI1B(KT_lPC

delta 83
zcmZo@P;3CAEsXa9rXSkOs5V(;h1ujb0j2FRfsA!-)6XqsblNU6gYg{a_Iv9YA2GKp
mZD9mrrtL~wnD0ezH`u}$#@8mm(k8&#CcxGvz`jg?!vFw(c^-ZM

diff --git a/aux/docker_build.sh b/aux/docker_build.sh
new file mode 100755
index 0000000..6b2a497
--- /dev/null
+++ b/aux/docker_build.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker build . -t git.kamkow1lair.pl/kamkow1/mop3/mop3-deploy:latest
diff --git a/aux/docker_devel.sh b/aux/docker_devel.sh
index 1e6a3a6..1822a17 100755
--- a/aux/docker_devel.sh
+++ b/aux/docker_devel.sh
@@ -1,3 +1,9 @@
 #!/bin/sh
 
-docker build -f Dockerfile.localdev --progress=plain --build-arg bt="$1" --output . .
+xhost +local:docker
+
+docker run -it --rm -v $(pwd):/work -w /work \
+  -e DISPLAY=$DISPLAY \
+  -v /tmp/.X11-unix:/tmp/.X11-unix \
+  --device /dev/kvm \
+  git.kamkow1lair.pl/kamkow1/mop3/mop3-deploy:latest
diff --git a/aux/qemu_amd64.sh b/aux/qemu_amd64.sh
index 11897a9..b1f7b9b 100755
--- a/aux/qemu_amd64.sh
+++ b/aux/qemu_amd64.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -x