no double imports

depth is mandatory rip
force user marc
2022-07-28 15:16:31 +02:00 · 2022-07-28 03:48:30 +02:00 · 2022-07-28 03:03:42 +02:00 · 2022-07-28 02:59:49 +02:00 · 2022-07-28 02:51:48 +02:00 · 2022-07-28 02:51:02 +02:00
5 changed files with 22 additions and 16 deletions
@@ -19,6 +19,7 @@ buildparabola: buildbase
 buildall: buildbase buildxorg buildvnc buildparabola

 updateall:
+	docker pull archlinux
 	docker-compose build --no-cache
 	# docker-compose build --no-cache xorg
 	# docker-compose build --no-cache vnc
@@ -26,6 +26,8 @@ services:
      # - /tmp:/tmp
      # devices:
      # - /dev/dri
+      - arch_pacman:/var/cache/pacman/pkg
+      - /srv/arch/home/marc:/home/marc

  vnc:
    image: marcpartensky/arch:vnc
@@ -35,9 +37,14 @@ services:
      - "18080:8080"
      - "15900:5900"
    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      # - /var/run/docker.sock:/var/run/docker.sock
+      - arch_pacman:/var/cache/pacman/pkg
+      - /srv/arch/home/marc:/home/marc

  parabola:
    image: marcpartensky/arch:parabola
    build:
      context: parabola
+
+volumes:
+  arch_pacman:
@@ -1,18 +1,16 @@
 FROM marcpartensky/arch:xorg
 LABEL maintainer=<marc.partensky@gmail.com>

+USER marc
 EXPOSE 5900 8080
 ENV DISPLAY=:0.0

 # Install packages
 RUN paru -Syyy --noconfirm \
-	net-tools \
-	supervisor \
-	alacritty \
 	x11vnc \
    novnc \
    cron \
-	xorg-server \
+	# xorg-server \
 	# xorg-server-utils \
    ttf-meslo-nerd-font-powerlevel10k \
 	xorg-server-xvfb
@@ -3,7 +3,7 @@ nodaemon=true
 ; nodaemon=false

 [program:X11]
-command=/usr/bin/Xvfb :0 -screen 0 1536x768x24
+command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
 autorestart=true
 user=marc
 priority=1
@@ -20,7 +20,7 @@ autorestart=true
 priority=2

 [program:x11vnc]
-command=/usr/bin/x11vnc
+command=/usr/bin/x11vnc -shared -forever
 autorestart=true
 user=marc
 priority=2
@@ -4,22 +4,22 @@ RUN paru -Syyy --noconfirm \
 	net-tools \
 	supervisor \
    firefox \
+	alacritty \
    picom \
    rofi \
    feh \
+    ttf-meslo-nerd-font-powerlevel10k \
+    # for nested x
+    xorg-server-xephyr \
+    # dwm build dependencies
+    libxft \
+    libxinerama
    # ttf-menlo-powerline-git \
    # ttf-meslo \
-    ttf-meslo-nerd-font-powerlevel10k \
-	alacritty \
-    xorg-xinit \
-	xorg-server \
+    # xorg-xinit \
+	# xorg-server \
 	# xorg-server-utils \
 	# xorg-server-xvfb \
-    xorg-server-xephyr
-
-
-# dwm build dependencies
-RUN paru -S --noconfirm libxft libxinerama

 # setup dwn
 RUN git clone https://github.com/marcpartensky/dwm git/dwm
Author	SHA1	Message	Date
marc	8502b7fcb9	no double imports Docker / build (push) Canceled after 0s Details	2022-07-28 15:16:31 +02:00
marc	fd147a99dc	depth is mandatory rip	2022-07-28 03:48:30 +02:00
marc	c4c6ff454d	force user marc	2022-07-28 03:03:42 +02:00
marc	72c6ee9bff	gotta pull archlinux because of regular pacman updates	2022-07-28 02:59:49 +02:00
marc	fb8378dea9	changed display	2022-07-28 02:51:48 +02:00
marc	408ad25ab3	shared forever	2022-07-28 02:51:02 +02:00
marc	4de87c9b02	rethinked volumes	2022-07-28 02:49:22 +02:00
marc	08b6b9ffbb	arch home volume	2022-07-28 02:46:43 +02:00