Merge pull request #43 from wayofdev/fix/network

Author: lotyp

.github/labeler.yml

@@ -1,3 +1,5 @@
+---
+
 # this file is for the labeler workflow job
 # Documentation https://github.com/marketplace/actions/labeler
 
@@ -7,7 +9,6 @@
   - ./*.md
 
 "type: maintenance":
-  - .dependabot/*
   - .github/workflows/*
-  - app/tests/**/*
-  - tests/**/*
+
+...

.github/workflows/label.yml renamed to .github/workflows/apply-labels.yml

@@ -1,8 +1,10 @@
+---
+
 # This workflow will triage pull requests and apply a label based on the
 # paths that are modified in the pull request.
 #
 # To use this workflow, you will need to set up a .github/labeler.yml
-# file with configuration.  For more information, see:
+# file with configuration. For more information, see:
 # https://github.com/actions/labeler/blob/master/README.md
 
 on:  # yamllint disable-line rule:truthy
@@ -12,11 +14,10 @@ name: 🏷️ Add labels
 
 jobs:
   label:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🏷️ Apply labels
-        uses: actions/labeler@v4
-        with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+    uses: wayofdev/gh-actions/.github/workflows/apply-labels.yml@master
+    with:
+      os: ubuntu-latest
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
 ...

.github/workflows/auto-merge-release.yaml

@@ -13,15 +13,14 @@ name: 🤞 Auto merge release
 
 jobs:
   auto-merge:
-    if: github.actor == 'lotyp' && startsWith(github.head_ref, 'release-please--')
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🤞 Auto-merge pull request
-        uses: peter-evans/enable-pull-request-automerge@v3
-        with:
-          pull-request-number: ${{ github.event.pull_request.number }}
-          merge-method: merge
-          # to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
-          token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/auto-merge-release.yml@master
+    with:
+      os: ubuntu-latest
+      pull-request-number: ${{ github.event.pull_request.number }}
+      actor: lotyp
+      merge-method: merge
+    secrets:
+      # to trigger other workflows, pass PAT token instead of GITHUB_TOKEN
+      token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
 
 ...

.github/workflows/ci.yml

@@ -45,3 +45,5 @@ jobs:
 
       - name: 🧪 Run dcgoss tests
         run: make test
+
+...

.github/workflows/create-release.yml

@@ -1,5 +1,6 @@
 ---
 
+# https://github.com/wayofdev/gh-actions/blob/master/.github/workflows/create-release.yml
 # https://github.com/google-github-actions/release-please-action#release-types-supported
 
 on:  # yamllint disable-line rule:truthy
@@ -11,30 +12,12 @@ name: 📦 Create release
 
 jobs:
   release:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 🎉 Create release
-        uses: google-github-actions/release-please-action@v3
-        id: release
-        with:
-          token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
-          release-type: node
-          package-name: docker-shared-services
-          default-branch: master
-          changelog-types: |
-            [
-              { "type": "feat", "section": "Features", "hidden": false },
-              { "type": "fix", "section": "Bug Fixes", "hidden": false },
-              { "type": "perf", "section": "Performance Improvements", "hidden": false },
-              { "type": "docs", "section": "Documentation", "hidden": false },
-              { "type": "chore", "section": "Miscellaneous", "hidden": false },
-              { "type": "style", "section": "Styles", "hidden": true },
-              { "type": "revert", "section": "Reverts", "hidden": true },
-              { "type": "deps", "section": "Dependencies", "hidden": true },
-              { "type": "refactor", "section": "Code Refactoring", "hidden": true },
-              { "type": "test", "section": "Tests", "hidden": true },
-              { "type": "build", "section": "Build System", "hidden": true },
-              { "type": "ci", "section": "Continuous Integration", "hidden": true }
-            ]
+    uses: wayofdev/gh-actions/.github/workflows/create-release.yml@master
+    with:
+      os: ubuntu-latest
+      branch: master
+      package-name: docker-shared-services
+    secrets:
+      token: ${{ secrets.PERSONAL_GITHUB_TOKEN }}
 
 ...

.github/workflows/shellcheck.yml

@@ -10,17 +10,11 @@ permissions:
 
 jobs:
   shellcheck:
-    runs-on: ubuntu-latest
-    steps:
-      - name: 📦 Check out the codebase
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: 🐞 Differential shell-check
-        uses: redhat-plumbers-in-action/differential-shellcheck@v4
-        with:
-          severity: warning
-          token: ${{ secrets.GITHUB_TOKEN }}
+    uses: wayofdev/gh-actions/.github/workflows/shellcheck.yml@master
+    with:
+      os: ubuntu-latest
+      severity: warning
+    secrets:
+      token: ${{ secrets.GITHUB_TOKEN }}
 
 ...

.github/workflows/sync-from-tpl.yml

@@ -1,6 +1,6 @@
 ---
 
-on:
+on:  # yamllint disable-line rule:truthy
   # Trigger At 00:00 on each 1st day of month
   schedule:
     - cron:  "0 0 1 * *"

.pre-commit-config.yaml

@@ -9,15 +9,10 @@ repos:
       - id: fix-encoding-pragma
 
   - repo: https://github.com/commitizen-tools/commitizen
-    rev: v2.42.1
+    rev: 3.5.2
     hooks:
       - id: commitizen
         stages:
           - commit-msg
 
-  - repo: https://github.com/rhysd/actionlint
-    rev: v1.6.23
-    hooks:
-      - id: actionlint
-
 ...

README.md

@@ -48,8 +48,9 @@ This repository configures Traefik to run together with, installed in system, dn
 * Installed [mkcert](https://github.com/FiloSottile/mkcert) binary in system
   * See full installation instructions in their official [README.md](https://github.com/FiloSottile/mkcert)
   * Quick installation on macOS: `brew install mkcert nss`
-* Installed and configured [dnsmasq](https://thekelleys.org.uk/dnsmasq/doc.html) daemon
-  * Can be installed and configured automatically via our own [ansible-role-dnsmasq](https://github.com/wayofdev/ansible-role-dnsmasq)
+* ~~Installed and configured [dnsmasq](https://thekelleys.org.uk/dnsmasq/doc.html) daemon~~
+  * ~~Can be installed and configured automatically via our own [ansible-role-dnsmasq](https://github.com/wayofdev/ansible-role-dnsmasq)~~
+  * DNSMasq service now is shipped and configured with this repository.
 
 <br>
 
@@ -180,7 +181,7 @@ This repository was created in **2022** by [lotyp / wayofdev](https://github.com
 
 <br>
 
-## 🫡 Contributors
+## 🫡 Supporters
 
 <img align="left" src="https://img.shields.io/github/contributors-anon/wayofdev/docker-shared-services?style=for-the-badge" alt="Contributors"/>
 

dnsmasq.conf

@@ -0,0 +1 @@
+address=/docker/127.0.0.1