Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@SimpleHomelab
SimpleHomelab committed Jul 16, 2020
1 parent 241afd2 commit c3996e3
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 27 deletions.
77 changes: 52 additions & 25 deletions .bash_aliases.example
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,89 @@ alias dsysprune='sudo docker system prune -a'
alias ddelimages='sudo docker rmi $(docker images -q)'
alias docerase='dstopcont ; drmcont ; ddelimages ; dvolprune ; dsysprune'
alias docprune='ddelimages ; dvolprune ; dsysprune'
alias dexec='docker exec -ti'
alias docps='docker ps -a'
alias dexec='sudo docker exec -ti'
alias docps='sudo docker ps -a'
alias dcrm='dcrun rm'
alias docdf='docker system df'
alias docdf='sudo docker system df'
alias dclogs='sudo docker logs -tf --tail="50" '
alias fixsecrets='sudo chown -R root:root /home/USER/docker/secrets ; sudo chmod -R 600 /home/USER/docker/secrets'

# STACK UP AND DOWN
alias dc1down='cd /home/USER/docker ; dcdown1v ; dcdown1'
alias dc1up='cd /home/USER/docker ; docker network create t1_proxy ; dcrec1 plexms ; dcup1 ; dcup1v'
alias dc2down='cd /home/USER/docker ; dcdown2v ; dcdown2'
alias dc2up='cd /home/USER/docker ; docker network create --gateway 192.168.90.1 --subnet 192.168.90.0/24 t2_proxy ; dcrec2 plexms ; dcup2 ; dcup2v'
alias 1down='cd /home/USER/docker ; dcdown1v ; dcdown1'
alias 1up='cd /home/USER/docker ; sudo docker network create t1_proxy ; dcrec1 plexms ; dcup1 ; dcup1v'
alias 2down='cd /home/USER/docker ; dcdown2v ; dcdown2'
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'

# DOCKER TRAEFIK 1
alias dcrun1='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t1.yml '
alias dclogs1='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t1.yml logs -tf --tail="50" '
alias dcrun1='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1.yml '
alias dclogs1='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1.yml logs -tf --tail="50" '
alias dcup1='dcrun1 up -d'
alias dcdown1='dcrun1 down'
alias dcrec1='dcrun1 up -d --force-recreate'
alias dcstop1='dcrun1 stop'
alias dcrestart1='dcrun1 restart '
alias dcpull1='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t1.yml pull'
alias dcpull1='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1.yml pull'

# DOCKER TRAEFIK 1 VPN
alias dcrun1v='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t1-vpn.yml '
alias dclogs1v='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t1-vpn.yml logs -tf --tail="50" '
alias dcrun1v='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1-vpn.yml '
alias dclogs1v='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1-vpn.yml logs -tf --tail="50" '
alias dcup1v='dcrun1v up -d'
alias dcdown1v='dcrun1v down'
alias dcrec1v='dcrun1v up -d --force-recreate'
alias dcstop1v='dcrun1v stop'
alias dcrestart1v='dcrun1v restart '
alias dcpull1v='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t1-vpn.yml pull'
alias dcpull1v='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t1-vpn.yml pull'

# DOCKER TRAEFIK 2
alias dcrun2='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t2.yml '
alias dclogs2='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t2.yml logs -tf --tail="50" '
alias dcrun2='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t2.yml '
alias dclogs2='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t2.yml logs -tf --tail="50" '
alias dcup2='dcrun2 up -d'
alias dcdown2='dcrun2 down'
alias dcrec2='dcrun2 up -d --force-recreate'
alias dcstop2='dcrun2 stop'
alias dcrestart2='dcrun2 restart '
alias dcpull2='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t2.yml pull'
alias dcpull2='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t2.yml pull'

# DOCKER TRAEFIK 2 VPN
alias dcrun2v='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t2-vpn.yml '
alias dclogs2v='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t2-vpn.yml logs -tf --tail="50" '
alias dcrun2v='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t2-vpn.yml '
alias dclogs2v='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t2-vpn.yml logs -tf --tail="50" '
alias dcup2v='dcrun2v up -d'
alias dcdown2v='dcrun2v down'
alias dcrec2v='dcrun2v up -d --force-recreate'
alias dcstop2v='dcrun2v stop'
alias dcrestart2v='dcrun2v restart '
alias dcpull2v='cd /home/USER/docker ; docker-compose -f /home/USER/docker/docker-compose-t2-vpn.yml pull'
alias dcpull2v='cd /home/USER/docker ; sudo docker-compose -f /home/USER/docker/docker-compose-t2-vpn.yml pull'

# DOCKER TRAEFIK 1 SWARM
alias dslogs='docker service logs -tf --tail="50"'
alias dsps='docker stack ps zstack'
alias dsse='docker stack services zstack'
alias dsls='docker stack ls'
alias dsrm='docker stack rm'
alias dsup='docker stack deploy --compose-file /home/USER/docker/docker-compose-swarm.yml zstack'
alias dslogs='sudo docker service logs -tf --tail="50"'
alias dsps='sudo docker stack ps zstack'
alias dsse='sudo docker stack services zstack'
alias dsls='sudo docker stack ls'
alias dsrm='sudo docker stack rm'
alias dsup='sudo docker stack deploy --compose-file /home/USER/docker/docker-compose-swarm.yml zstack'
alias dshelp='echo "dslogs dsps dsse dsls dsrm dsup"'

# SHUTDOWN AND RESTART
alias shutdown='sudo shutdown -h now'
alias reboot='sudo reboot'

# NETWORKING
alias portsused='sudo netstat -tulpn | grep LISTEN'

# FILE SIZE AND STORAGE
alias free='free -h'
alias fdisk='sudo fdisk -l'
alias uuid='sudo vol_id -u'
alias ll='ls -alh'
alias dirsize='sudo du -hx --max-depth=1'

# SYNOLOGY DSM COMMANDS
alias servicelist='sudo synoservicecfg --list'
alias servicestatus='sudo synoservice --status'
alias servicestop='sudo synoservicecfg --stop'
alias servicehstop='sudo synoservicecfg --hard-stop'
alias servicestart='sudo synoservicecfg --start'
alias servicehstart='sudo synoservicecfg --hard-start'
alias servicerestart='sudo synoservice --restart'
alias servicerestart2='sudo synoservicectl --restart'
alias restartdocker='sudo synoservice --restart pkgctl-Docker'
12 changes: 10 additions & 2 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,19 @@
- tecnative docker proxy
- traefik custom error pages https://github.com/guillaumebriday/traefik-custom-error-pages
- improvements from https://github.com/jamescurtin/traefik-proxy
- implement secrets
- move from toml to yaml

## July 14, 2020
## July 16, 2020

- Removed USER from docker group to enforce use of sudo for docker commands (improve security)
- Updated bash_aliases
- Implemented Docker secrets

## July 14, 2020

- Added Synology Docker Compose for Traefik 2
- Introduced new environmental variable $DOCKERDIR for simplicity
- Introduced new environmental variable \$DOCKERDIR for simplicity

## June 25, 2020

Expand Down
2 changes: 2 additions & 0 deletions docker-compose-t2.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ services:
environment:
- CF_API_EMAIL=$CLOUDFLARE_EMAIL
- CF_API_KEY=$CLOUDFLARE_API_KEY
- CF_API_EMAIL_FILE=/run/secrets/cloudflare-api-email
- CF_API_KEY_FILE=/run/secrets/cloudflare-api-key
labels:
- "traefik.enable=true"
# HTTP-to-HTTPS Redirect
Expand Down

0 comments on commit c3996e3

Please sign in to comment.