From 204f6dbcde335d6385f077ad38eacec9721c99ce Mon Sep 17 00:00:00 2001
From: Thomas Nordquist <t.nordquist@gastromatic.com>
Date: Fri, 10 May 2024 21:18:17 +0200
Subject: [PATCH] chore: fix docker context

---
 .github/workflows/build-dockerfile.yml | 10 +++-------
 .github/workflows/ui-test.yml          | 25 +++----------------------
 docker/Dockerfile => Dockerfile        |  5 ++---
 3 files changed, 8 insertions(+), 32 deletions(-)
 rename docker/Dockerfile => Dockerfile (80%)

diff --git a/.github/workflows/build-dockerfile.yml b/.github/workflows/build-dockerfile.yml
index 17e4c3f..18e8d8b 100644
--- a/.github/workflows/build-dockerfile.yml
+++ b/.github/workflows/build-dockerfile.yml
@@ -1,5 +1,3 @@
-name: Build
-
 on:
   push:
     branches:
@@ -8,15 +6,14 @@ on:
       - beta
       - tnordquist/test-ci
     paths:
-      - ./docker
+      - Dockerfile
       - .github
 
 jobs:
   create-image:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+      - uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
@@ -29,6 +26,5 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ./Dockerfile
           push: true
-          tags: thomasnordquist/mqtt-explorer-ui-tests:latest
+          tags: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
index 36c2e4b..0e5449f 100644
--- a/.github/workflows/ui-test.yml
+++ b/.github/workflows/ui-test.yml
@@ -1,34 +1,15 @@
 on: [push]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-    name: A job to say hello
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: thomasnordquist/mqtt-explorer-ui-tests:latest
   test:
     runs-on: ubuntu-latest
     container:
-      image: thomasnordquist/mqtt-explorer-ui-tests:latest
+      image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
       volumes:
         - ./:/app
+      options: --user root
     steps:
+      - uses: actions/checkout@v4
       - name: Install Packages
         run: yarn install --frozen-lockfile
       - name: Build
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 80%
rename from docker/Dockerfile
rename to Dockerfile
index a4a916e..10f985f 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM node:19.8.1-bullseye-slim
+FROM node:20
 
 RUN DEBIAN_FRONTEND="noninteractive" apt-get update \
-  && apt-get install -y --no-install-recommends nano ffmpeg xvfb git-core tmux locales mosquitto x11vnc
+  && apt-get install -y --no-install-recommends ca-certificates nano ffmpeg xvfb git-core tmux locales mosquitto x11vnc
 RUN apt-get install -yq --no-install-recommends libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 libnss3
 
 # Generate locales for TMUX
@@ -12,6 +12,5 @@ ENV LC_ALL en_US.UTF-8
 
 CMD /bin/bash
 
-COPY cloneBuildAndTest.sh ./
 VOLUME /app
 EXPOSE 5900