Skip to content

Commit

Permalink
chore: fix docker context
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Nordquist committed May 10, 2024
1 parent 7fa9970 commit 7d0c486
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 31 deletions.
14 changes: 5 additions & 9 deletions .github/workflows/build-dockerfile.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
name: Build

on:
push:
branches:
- master
- release
- beta
- tnordquist/test-ci
paths:
- ./docker
- .github
# paths:
# - ./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
Expand All @@ -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
21 changes: 0 additions & 21 deletions .github/workflows/ui-test.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,6 @@
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:
Expand Down
1 change: 0 additions & 1 deletion docker/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ ENV LC_ALL en_US.UTF-8

CMD /bin/bash

COPY cloneBuildAndTest.sh ./
VOLUME /app
EXPOSE 5900

0 comments on commit 7d0c486

Please sign in to comment.