save / reuse user data

.github/workflows/server-test.yaml

@@ -5,6 +5,7 @@ on:
     branches: ["main"]
   pull_request:
     branches: ["main"]
+  workflow_dispatch:
 
 jobs:
   test:
@@ -20,6 +21,34 @@ jobs:
           go-version-file: "server/go.mod"
           cache: true
 
+      - name: Install Chromium
+        run: sudo apt-get update && (sudo apt-get install -y chromium || sudo apt-get install -y chromium-browser)
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # - name: Log in to GitHub Container Registry (for buildkit base)
+      #   uses: docker/login-action@v3
+      #   with:
+      #     registry: ghcr.io
+      #     username: ${{ github.actor }}
+      #     password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Prepare env for image scripts
+        run: echo "UKC_TOKEN=dummy" >> $GITHUB_ENV && echo "UKC_METRO=dummy" >> $GITHUB_ENV
+
+      - name: Build chromium-headful-test image
+        run: |
+          set -eux
+          export UKC_TOKEN=dummy UKC_METRO=dummy IMAGE=onkernel/chromium-headful-test:latest
+          bash images/chromium-headful/build-docker.sh
+
+      - name: Build chromium-headless-test image
+        run: |
+          set -eux
+          export UKC_TOKEN=dummy UKC_METRO=dummy IMAGE=onkernel/chromium-headless-test:latest
+          bash images/chromium-headless/build-docker.sh
+
       - name: Run server Makefile tests
         run: make test
         working-directory: server

images/chromium-headful/Dockerfile

@@ -50,7 +50,6 @@ RUN apt-get update && \
     imagemagick \
     sudo \
     mutter \
-    x11vnc \
     # Python/pyenv reqs
     build-essential \
     libssl-dev  \
@@ -137,14 +136,9 @@ RUN set -eux; \
     apt-get clean -y; \
     rm -rf /var/lib/apt/lists/* /var/cache/apt/
 
-# install chromium & ncat for proxying the remote debugging port
+# install chromium and sqlite3 for debugging the cookies file
 RUN add-apt-repository -y ppa:xtradeb/apps
-RUN apt update -y && apt install -y chromium ncat
-
-# Install noVNC
-RUN git clone --branch v1.5.0 https://github.com/novnc/noVNC.git /opt/noVNC && \
-    git clone --branch v0.12.0 https://github.com/novnc/websockify /opt/noVNC/utils/websockify && \
-    ln -s /opt/noVNC/vnc.html /opt/noVNC/index.html
+RUN apt update -y && apt install -y chromium sqlite3
 
 # setup desktop env & app
 ENV DISPLAY_NUM=1
@@ -160,14 +154,17 @@ COPY --from=xorg-deps /usr/local/lib/xorg/modules/drivers/dummy_drv.so /usr/lib/
 COPY --from=xorg-deps /usr/local/lib/xorg/modules/input/neko_drv.so /usr/lib/xorg/modules/input/neko_drv.so
 
 COPY image-chromium/ /
+COPY start-chromium.sh /images/chromium-headful/start-chromium.sh
+RUN chmod +x /images/chromium-headful/start-chromium.sh
 COPY ./wrapper.sh /wrapper.sh
+COPY supervisord.conf /etc/supervisor/supervisord.conf
+COPY supervisor/services/ /etc/supervisor/conf.d/services/
 
 # copy the kernel-images API binary built externally
 COPY bin/kernel-images-api /usr/local/bin/kernel-images-api
 ENV WITH_KERNEL_IMAGES_API=false
 
 RUN useradd -m -s /bin/bash kernel
-RUN cp -r ./user-data /home/kernel/user-data
 
 ENTRYPOINT [ "/wrapper.sh" ]