chore: fix docker context
This commit is contained in:
10
.github/workflows/build-dockerfile.yml
vendored
10
.github/workflows/build-dockerfile.yml
vendored
@@ -1,5 +1,3 @@
|
|||||||
name: Build
|
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
@@ -8,15 +6,14 @@ on:
|
|||||||
- beta
|
- beta
|
||||||
- tnordquist/test-ci
|
- tnordquist/test-ci
|
||||||
paths:
|
paths:
|
||||||
- ./docker
|
- Dockerfile
|
||||||
- .github
|
- .github
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
create-image:
|
create-image:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Set up QEMU
|
- uses: actions/checkout@v4
|
||||||
uses: docker/setup-qemu-action@v3
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
@@ -29,6 +26,5 @@ jobs:
|
|||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
file: ./Dockerfile
|
|
||||||
push: true
|
push: true
|
||||||
tags: thomasnordquist/mqtt-explorer-ui-tests:latest
|
tags: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
|
||||||
|
|||||||
25
.github/workflows/ui-test.yml
vendored
25
.github/workflows/ui-test.yml
vendored
@@ -1,34 +1,15 @@
|
|||||||
on: [push]
|
on: [push]
|
||||||
|
|
||||||
jobs:
|
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:
|
test:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: thomasnordquist/mqtt-explorer-ui-tests:latest
|
image: ghcr.io/thomasnordquist/mqtt-explorer-ui-tests:latest
|
||||||
volumes:
|
volumes:
|
||||||
- ./:/app
|
- ./:/app
|
||||||
|
options: --user root
|
||||||
steps:
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
- name: Install Packages
|
- name: Install Packages
|
||||||
run: yarn install --frozen-lockfile
|
run: yarn install --frozen-lockfile
|
||||||
- name: Build
|
- name: Build
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
FROM node:19.8.1-bullseye-slim
|
FROM node:20
|
||||||
|
|
||||||
RUN DEBIAN_FRONTEND="noninteractive" apt-get update \
|
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
|
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
|
# Generate locales for TMUX
|
||||||
@@ -12,6 +12,5 @@ ENV LC_ALL en_US.UTF-8
|
|||||||
|
|
||||||
CMD /bin/bash
|
CMD /bin/bash
|
||||||
|
|
||||||
COPY cloneBuildAndTest.sh ./
|
|
||||||
VOLUME /app
|
VOLUME /app
|
||||||
EXPOSE 5900
|
EXPOSE 5900
|
||||||
Reference in New Issue
Block a user