Skip to content

Commit e5e1ad7

Browse files
committed
updated bash_aliases for socket_proxy. Added socket_proxy. Moved sensitve information to secrets. Added watchtower to obsolete.
1 parent 93e3077 commit e5e1ad7

4 files changed

+242
-54
lines changed

.bash_aliases.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ alias fixsecrets='sudo chown -R root:root /home/USER/docker/secrets ; sudo chmod
1818
alias 1down='cd /home/USER/docker ; dcdown1v ; dcdown1'
1919
alias 1up='cd /home/USER/docker ; sudo docker network create t1_proxy ; dcrec1 plexms ; dcup1 ; dcup1v'
2020
alias 2down='cd /home/USER/docker ; dcdown2v ; dcdown2'
21-
alias 2up='cd /home/USER/docker ; sudo docker network create --gateway 192.168.90.1 --subnet 192.168.90.0/24 t2_proxy ; dcrec2 plexms ; dcup2 ; dcup2v'
21+
alias 2up='cd /home/USER/docker ; sudo docker network create --gateway 192.168.91.1 --subnet 192.168.91.0/24 socket_proxy ; sudo docker network create --gateway 192.168.90.1 --subnet 192.168.90.0/24 t2_proxy ; dcrec2 plexms ; dcup2 ; dcup2v'
2222

2323
# DOCKER TRAEFIK 1
2424
alias dcrun1='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1.yml '
@@ -92,4 +92,4 @@ alias servicestart='sudo synoservicecfg --start'
9292
alias servicehstart='sudo synoservicecfg --hard-start'
9393
alias servicerestart='sudo synoservice --restart'
9494
alias servicerestart2='sudo synoservicectl --restart'
95-
alias restartdocker='sudo synoservice --restart pkgctl-Docker'
95+
alias restartdocker='sudo synoservice --restart pkgctl-Docker'

CHANGELOG.md

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,15 @@
44

55
## Planned:
66

7-
- Add projectsend, embystat, nextcloud, nut-upsd, HealthChecks, FileRun, smtp-to-telegram, fail2ban
8-
- tecnative docker proxy
7+
- Add projectsend, embystat, nextcloud, nut-upsd, HealthChecks, FileRun, smtp-to-telegram, fail2ban, ofelia
98
- traefik custom error pages https://github.com/guillaumebriday/traefik-custom-error-pages
109
- improvements from https://github.com/jamescurtin/traefik-proxy
11-
- implement secrets
10+
- implement secrets and remove variables from .env
11+
- Replace Ouroboros (stopped development + requires POST permissions on Socket Proxy) with Watchtower
12+
13+
## July 22, 2020
14+
15+
- Implemented socket proxy - Traefik, Portainer, Dozzle, Glances, cf-Companion, Docker-GC, WatchTower. Exception: ha-dockermon.
1216

1317
## July 16, 2020
1418

@@ -17,7 +21,7 @@
1721
- Partially implemented Docker secrets
1822
- passHostHeader is true by default. Removed from rules.
1923
- Moved from toml to yml. Included examples for both in repo.
20-
- Added $SECRETSDIR env variable
24+
- Added \$SECRETSDIR env variable
2125
- Expanded bash_aliases
2226

2327
## July 14, 2020

docker-compose-t2-obsolete.yml

+31
Original file line numberDiff line numberDiff line change
@@ -291,3 +291,34 @@ services:
291291
## HTTP Services
292292
- "traefik.http.routers.homeassistant-rtr.service=homeassistant-svc"
293293
- "traefik.http.services.homeassistant-svc.loadbalancer.server.port=8123"
294+
295+
# Watchtower - Automatic Docker Container Updates
296+
# creating config.json https://github.com/containrrr/watchtower/issues/99
297+
watchtower:
298+
image: containrrr/watchtower
299+
container_name: watchtower
300+
restart: unless-stopped
301+
networks:
302+
- socket_proxy
303+
- t2_proxy
304+
# depends_on:
305+
# - socket-proxy
306+
volumes:
307+
# - /var/run/docker.sock:/var/run/docker.sock # Use Docker Socket Proxy instead for improved security
308+
- $DOCKERDIR/watchtower/config.json:/config.json # Only needed for private registries
309+
environment:
310+
- TZ=$TZ
311+
# - WATCHTOWER_CLEANUP=true # Cleanup old images
312+
- DOCKER_HOST=tcp://socket-proxy:2375
313+
# - WATCHTOWER_INCLUDE_STOPPED=false
314+
- WATCHTOWER_NOTIFICATIONS_LEVEL=info # panic, fatal, error, warn, info (default), debug or trace
315+
# - WATCHTOWER_POLL_INTERVAL=60 # 1 week in seconds 604800
316+
# - WATCHTOWER_SCHEDULE=0 0 1 * * SUN # Every Sunday at 1 am
317+
- WATCHTOWER_RUN_ONCE=true
318+
- WATCHTOWER_MONITOR_ONLY=true
319+
# - WATCHTOWER_LABEL_ENABLE=true
320+
- WATCHTOWER_DEBUG=true
321+
# - WATCHTOWER_NOTIFICATIONS=shoutrrr
322+
# - WATCHTOWER_NOTIFICATION_URL="telegram://$TGRAM_BOT_TOKEN@$TGRAM_CHAT_ID"
323+
labels:
324+
- "com.centurylinklabs.watchtower.enable=true" # Add this to services to enable updates

0 commit comments

Comments
 (0)