no double imports

.github/workflows/docker-build-test.yml

@@ -1,6 +1,8 @@
-name: Build all sequentially to test builds
+name: Docker
 
 on:
+  schedule:
+  - cron: "0 4 * * *" # everyday at 4 am
   push:
     branches:
       - '*'         # matches every branch that doesn't contain a '/'
@@ -15,114 +17,23 @@ on:
   pull_request:
 
 jobs:
-  base:
+  build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: base
-        tags: marcpartensky/arch:base
-        outputs: type=docker,dest=/tmp/base.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: base
-        path: /tmp/base.tar
-
-  xorg:
-    needs: base
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: base
-        path: /tmp  
-
-    - name: Load image
-      run: |
-        docker load --input /tmp/base.tar
-        docker image ls -a
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: xorg
-        tags: marcpartensky/arch:xorg
-        outputs: type=docker,dest=/tmp/xorg.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: xorg
-        path: /tmp/xorg.tar
-
-  vnc:
-    needs: xorg
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: xorg
-        path: /tmp  
-
-    - name: Load image
-      run: |
-        docker load --input /tmp/xorg.tar
-        docker image ls -a
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: vnc
-        tags: marcpartensky/arch:vnc
-        outputs: type=docker,dest=/tmp/vnc.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: vnc
-        path: /tmp/vnc.tar
-
-  parabola:
-    needs: xorg
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: docker/setup-buildx-action@v2
-
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: xorg
-        path: /tmp  
-
-    - name: Load image
-      run: |
-        docker load --input /tmp/xorg.tar
-        docker image ls -a
-
-    - name: Build and export
-      uses: docker/build-push-action@v3
-      with:
-        context: parabola
-        tags: marcpartensky/arch:parabola
-        outputs: type=docker,dest=/tmp/parabola.tar
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: parabola
-        path: /tmp/parabola.tar
+    - uses: actions/checkout@v2
+    - name: Update apt
+      run: sudo apt update && sudo apt upgrade -y && sudo apt autoremove -y
+    - name: Install make
+      run: sudo apt install make docker-compose -y
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v1
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v1
+    - name: build base
+      run: make buildbase
+    - name: build xorg
+      run: make buildxorg
+    - name: build vnc
+      run: make buildvnc
+    - name: build parabola
+      run: make buildparabola

.github/workflows/docker-push.yml

@@ -1,4 +1,4 @@
-name: Build all then push
+name: Docker
 
 on:
   schedule:

Makefile

@@ -20,10 +20,10 @@ buildall: buildbase buildxorg buildvnc buildparabola
 
 updateall:
 	docker pull archlinux
-	docker-compose build --no-cache base
-	docker-compose build --no-cache xorg
-	docker-compose build --no-cache vnc
-	docker-compose build --no-cache parabola
+	docker-compose build --no-cache
+	# docker-compose build --no-cache xorg
+	# docker-compose build --no-cache vnc
+	# docker-compose build --no-cache parabola
 	docker-compose push
 
 push: buildall

docker-compose.yml

@@ -33,14 +33,13 @@ services:
     image: marcpartensky/arch:vnc
     build:
       context: vnc
-    # user: $USER
     ports:
       - "18080:8080"
       - "15900:5900"
     volumes:
       # - /var/run/docker.sock:/var/run/docker.sock
       - arch_pacman:/var/cache/pacman/pkg
-      - arch_home:/home/marc
+      - /srv/arch/home/marc:/home/marc
 
   parabola:
     image: marcpartensky/arch:parabola
@@ -49,4 +48,3 @@ services:
 
 volumes:
   arch_pacman:
-  arch_home:

vnc/Dockerfile

@@ -6,22 +6,23 @@ EXPOSE 5900 8080
 ENV DISPLAY=:0.0
 
 # Install packages
-RUN paru -Syyyu --noconfirm \
-    # xorg-server required for xdummy
-	xorg-server \
-    # xorg-server-utils \
-	xorg-server-xvfb \
-    # xf86-video-dummy \
+RUN paru -Syyy --noconfirm \
 	x11vnc \
     novnc \
     cron \
-    ttf-meslo-nerd-font-powerlevel10k
+	# xorg-server \
+	# xorg-server-utils \
+    ttf-meslo-nerd-font-powerlevel10k \
+	xorg-server-xvfb
 
 USER root
 COPY crontab.txt /var/spool/cron/marc
 RUN chmod 600 /var/spool/cron/marc
 
 USER marc
-COPY supervisord.conf entrypoint.sh /opt/arch/
-ENTRYPOINT [ "/opt/arch/entrypoint.sh" ]
+COPY supervisord.ini /etc/supervisor.d/supervisord.ini
+
+USER root
+COPY entrypoint.sh entrypoint.sh
+ENTRYPOINT [ ".//entrypoint.sh" ]
 # ENTRYPOINT ["/usr/bin/supervisord", "-c", "/etc/supervisor.d/supervisord.ini"]

vnc/entrypoint.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/sbin/zsh
 
 export WALLPAPERS_PATH=/home/marc/wallpapers
-supervisord -c /opt/arch/supervisord.conf -l /tmp/supervisord.log
+/usr/bin/supervisord -c /etc/supervisor.d/supervisord.ini

vnc/supervisord.ini

@@ -1,29 +1,20 @@
 [supervisord]
 nodaemon=true
+; nodaemon=false
 
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[unix_http_server]
-file=/tmp/supervisord.sock
-
-[supervisorctl]
-serverurl=unix:///tmp/supervisord.sock
-
-[program:xvfb]
-command=Xvfb :0 -screen 0 1820x980x8
+[program:X11]
+command=/usr/bin/Xvfb :0 -screen 0 1820x980x8
 autorestart=true
 user=marc
 priority=1
 
-# [program:xdummy]
-# command=/usr/bin/Xdummy :0 -screen 0 1820x980x8
-# autorestart=true
-# user=marc
-# priority=1
+; [program:startx]
+; command=startx
+; autorestart=true
+; priority=1
 
 [program:picom]
-command=picom
+command=zsh -c "sleep 5 && picom -b"
 user=marc
 autorestart=true
 priority=2

xorg/Dockerfile

@@ -1,6 +1,6 @@
 FROM marcpartensky/arch
 
-RUN paru -Syyyu --noconfirm \
+RUN paru -Syyy --noconfirm \
 	net-tools \
 	supervisor \
     firefox \
@@ -45,7 +45,7 @@ RUN git clone https://github.com/marcpartensky/shell git/shell
 RUN make -C git/shell
 
 USER root
-COPY supervisord.ini /etc/supervisor.d/supervisord.ini
 COPY entrypoint.sh entrypoint.sh
+COPY supervisord.ini /etc/supervisor.d/supervisord.ini
 ENTRYPOINT [ "./entrypoint.sh" ]
 # ENTRYPOINT [ "DISPLAY=:0", "Xephyr", ":1" ]