Skip to content

Commit

Permalink
dnsmasq should return nxdomain for unknowns not refuse
Browse files Browse the repository at this point in the history
  • Loading branch information
ilude committed Apr 17, 2024
1 parent b24cf49 commit 58f26eb
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
22 changes: 18 additions & 4 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,15 @@ name: Build and Publish Docker Image
on:
workflow_dispatch:
push:
branches: [ "main" ]
# Publish semver tags as releases.
branches: [ '**' ]
tags: [ 'v*.*.*' ]
paths:
- 'app/**/*'
- 'Dockerfile'
- 'requirements.txt'
- '.github/workflows/docker-publish.yml'
pull_request:
branches: [ "main" ]
branches: [ "master" ]
types: [ closed ]
paths:
- 'app/**/*'
Expand Down Expand Up @@ -47,6 +46,21 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Docker meta
id: meta
uses: docker/metadata-action@v5
with:
# list of Docker images to use as base name for tags
images: |
${{ github.repository }}
ghcr.io/${{ github.repository }}
# generate Docker tags based on the following events/attributes
tags: |
type=ref,event=branch
type=ref,event=pr
type=raw,value=latest,enable={{is_default_branch}}
type=sha
# Set up BuildKit Docker container builder to be able to build
# multi-platform images and export cache
# https://github.com/docker/setup-buildx-action
Expand Down Expand Up @@ -80,7 +94,7 @@ jobs:
context: .
target: production
push: ${{ github.event_name != 'pull_request' }}
tags: ghcr.io/${{ github.repository }}:latest,${{ steps.meta.outputs.tags }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha
cache-to: type=gha,mode=max
Expand Down
1 change: 1 addition & 0 deletions app/templates/dnsmasq.conf.erb
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ log-queries
<% if ENV.fetch('JOYRIDE_LOG_DEBUG', 'false').downcase.eql?('true') %>
log-debug
<% end %>
address=/#/

0 comments on commit 58f26eb

Please sign in to comment.