Skip to content

Commit

Permalink
Predefined service: Blocky (#250)
Browse files Browse the repository at this point in the history
* Add service template for Blocky

* Add default config file

* Add Blocky to supported services

* Add README
  • Loading branch information
marcauberer committed Dec 9, 2021
1 parent 6ccc364 commit 3b69c9c
Show file tree
Hide file tree
Showing 7 changed files with 82 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .github/scripts/service-tester/predefined-service-tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ def get_all_template_names():
template_tuples = []
template_types = ["backend", "database", "db-admin", "frontend"]
skipped_names = ["rocket", "faunadb", "gitea", "spring-gradle",
"gitlab", "adguard-home", "pi-hole", "vue", "live-poll"]
"gitlab", "adguard-home", "pi-hole", "vue",
"live-poll", "blocky"]
for template_type in template_types:
template_type_path = TEMPLATES_PATH + '/' + template_type
services = [f for f in listdir(template_type_path) if isdir(
Expand Down
44 changes: 22 additions & 22 deletions docs/docs/supported-services.md

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions predefined-services/backend/blocky/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Blocky
Blocky is a DNS proxy and ad-blocker for the local network written in Go. It offers advanced DNS configuration, high performance, ad-blocking with DNS filters, security and privacy, simple installation and configuration.

### Setup
Blocky is considered as backend service and can therefore be found in backends collection, when generating the compose configuration with Compose Generator.
37 changes: 37 additions & 0 deletions predefined-services/backend/blocky/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"label": "Blocky",
"preselected": "false",
"files": [
{
"path": "service.yml",
"type": "service"
},
{
"path": "README.md",
"type": "docs"
}
],
"questions": [
{
"text": "Which port do you want to expose for the Blocky web interface?",
"type": 2,
"defaultValue": "4000",
"validator": "port",
"variable": "BLOCKY_PORT"
},
{
"text": "Which version of Blocky do you want to use?",
"type": 2,
"defaultValue": "latest",
"variable": "BLOCKY_VERSION"
}
],
"volumes": [
{
"text": "Custom path for Blocky config volume?",
"defaultValue": "./volumes/blocky-config",
"variable": "VOLUME_BLOCKY_CONFIG",
"advanced": true
}
]
}
1 change: 1 addition & 0 deletions predefined-services/backend/blocky/environment.env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
TZ=Europe/Berlin
11 changes: 11 additions & 0 deletions predefined-services/backend/blocky/service.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
image: spx01/blocky:${{BLOCKY_VERSION}}
container_name: ${{PROJECT_NAME_CONTAINER}}-backend-blocky
restart: always
ports:
- 53:53/tcp
- 53:53/udp
- ${{BLOCKY_PORT}}:4000
volumes:
- ${{VOLUME_BLOCKY_CONFIG}}/config.yml:/app/config.yml
env_file:
- environment.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
upstream:
default:
- 1.1.1.1
- 1.0.0.1

0 comments on commit 3b69c9c

Please sign in to comment.