From 42229828b4dbe2204cfe8f9c4364cd3a5d039d26 Mon Sep 17 00:00:00 2001 From: Pratham Patel Date: Sat, 23 Jul 2022 20:06:02 +0530 Subject: [PATCH] replace 'security_opt' with ':Z' --- extras/hugo-thefossguy-blog-compose.yml | 4 +--- extras/hugo-thefossguy-machines-compose.yml | 2 -- extras/new-nextcloud-compose.yml | 16 ++++++++-------- extras/pihole-compoose.yml | 6 ++---- extras/pyload-ng-compose.yml | 6 ++---- extras/syncthing-compose.yml | 6 ++---- extras/transmission-compose.yml | 6 +++--- 7 files changed, 18 insertions(+), 28 deletions(-) diff --git a/extras/hugo-thefossguy-blog-compose.yml b/extras/hugo-thefossguy-blog-compose.yml index 44f7652..433b53a 100644 --- a/extras/hugo-thefossguy-blog-compose.yml +++ b/extras/hugo-thefossguy-blog-compose.yml @@ -9,11 +9,9 @@ services: ports: - 8030:1313 volumes: - - /trayimurti/containers/volumes/thefossguy-blog:/src:Z + - /trayimurti/containers/volumes/blog:/src:Z environment: - TZ=Asia/Kolkata - security_opt: - - label=disable # this image is not official, but is endorsed in a somewhat official capacity # https://discourse.gohugo.io/t/klakeggs-wonderful-hugo-docker-image-update-thread/20347 diff --git a/extras/hugo-thefossguy-machines-compose.yml b/extras/hugo-thefossguy-machines-compose.yml index 105fe17..73788bc 100644 --- a/extras/hugo-thefossguy-machines-compose.yml +++ b/extras/hugo-thefossguy-machines-compose.yml @@ -12,8 +12,6 @@ services: - /trayimurti/containers/volumes/thefossguy-machines:/src:Z environment: - TZ=Asia/Kolkata - security_opt: - - label=disable # this image is not official, but is endorsed in a somewhat official capacity # https://discourse.gohugo.io/t/klakeggs-wonderful-hugo-docker-image-update-thread/20347 diff --git a/extras/new-nextcloud-compose.yml b/extras/new-nextcloud-compose.yml index 55bb6f2..43fe970 100644 --- a/extras/new-nextcloud-compose.yml +++ b/extras/new-nextcloud-compose.yml @@ -6,7 +6,7 @@ services: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW restart: always volumes: - - db:/var/lib/mysql + - db:/var/lib/mysql:Z environment: - MYSQL_ROOT_PASSWORD= # env_file: @@ -20,7 +20,7 @@ services: image: nextcloud:fpm-alpine restart: always volumes: - - nextcloud:/var/www/html + - nextcloud:/var/www/html:Z environment: - MYSQL_HOST=db - REDIS_HOST=redis @@ -46,7 +46,7 @@ services: image: nextcloud:fpm-alpine restart: always volumes: - - nextcloud:/var/www/html + - nextcloud:/var/www/html:Z entrypoint: /cron.sh depends_on: - db @@ -62,17 +62,17 @@ services: com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy: "true" volumes: - certs:/etc/nginx/certs:ro - - vhost.d:/etc/nginx/vhost.d - - html:/usr/share/nginx/html + - vhost.d:/etc/nginx/vhost.d:Z + - html:/usr/share/nginx/html:Z - /var/run/docker.sock:/tmp/docker.sock:ro letsencrypt-companion: image: jrcs/letsencrypt-nginx-proxy-companion restart: always volumes: - - certs:/etc/nginx/certs - - vhost.d:/etc/nginx/vhost.d - - html:/usr/share/nginx/html + - certs:/etc/nginx/certs:Z + - vhost.d:/etc/nginx/vhost.d:Z + - html:/usr/share/nginx/html:Z - /var/run/docker.sock:/var/run/docker.sock:ro depends_on: - proxy diff --git a/extras/pihole-compoose.yml b/extras/pihole-compoose.yml index f6077c9..355d141 100644 --- a/extras/pihole-compoose.yml +++ b/extras/pihole-compoose.yml @@ -11,13 +11,11 @@ services: environment: - TZ: Asia/Kolkata volumes: - - /trayimurti/containers/volumes/pi-hole/etc-pihole:/etc/pihole - - /trayimurti/containers/volumes/pi-hole/etc-dnsmasq.d:/etc/dnsmasq.d + - /trayimurti/containers/volumes/pi-hole/etc-pihole:/etc/pihole:Z + - /trayimurti/containers/volumes/pi-hole/etc-dnsmasq.d:/etc/dnsmasq.d:Z cap_add: - NET_ADMIN restart: unless-stopped - security_opt: - - label=disable # create dirs # mkdir -vp /trayimurti/containers/volumes/pi-hole/{etc-pihole,etc-dnsmasq} diff --git a/extras/pyload-ng-compose.yml b/extras/pyload-ng-compose.yml index c756e18..504e958 100644 --- a/extras/pyload-ng-compose.yml +++ b/extras/pyload-ng-compose.yml @@ -7,13 +7,11 @@ services: environment: - TZ=Asia/Kolkata volumes: - - /trayimurti/containers/volumes/pyload-ng/config:/config - - /trayimurti/containers/volumes/pyload-ng/downloads:/downloads + - /trayimurti/containers/volumes/pyload-ng/config:/config:Z + - /trayimurti/containers/volumes/pyload-ng/downloads:/downloads:Z ports: - 8081:8000 restart: unless-stopped - security_opt: - - label=disable # default uname:passwd => pyload:pyload diff --git a/extras/syncthing-compose.yml b/extras/syncthing-compose.yml index 132d7e4..1563abc 100644 --- a/extras/syncthing-compose.yml +++ b/extras/syncthing-compose.yml @@ -8,16 +8,14 @@ services: environment: - TZ=Asia/Kolkata volumes: - - /trayimurti/containers/volumes/syncthing/config:/config - - /trayimurti/containers/volumes/syncthing/data:/data + - /trayimurti/containers/volumes/syncthing/config:/config:Z + - /trayimurti/containers/volumes/syncthing/data:/data:Z ports: - 8001:8384 - 22000:22000/tcp - 22000:22000/udp - 21027:21027/udp restart: unless-stopped - security_opt: - - label=disable # create dirs # mkdir -p /trayimurti/containers/volumes/syncthing/{config,data} diff --git a/extras/transmission-compose.yml b/extras/transmission-compose.yml index 4cf0a9c..ee714b6 100644 --- a/extras/transmission-compose.yml +++ b/extras/transmission-compose.yml @@ -9,9 +9,9 @@ services: - TRANSMISSION_WEB_HOME=/transmission-web-control/ # - TRANSMISSION_WEB_HOME=/flood-for-transmission/ volumes: - - /trayimurti/torrents/config:/config - - /trayimurti/torrents/downloads:/downloads - - /trayimurti/torrents/watch:/watch + - /trayimurti/torrents/config:/config:Z + - /trayimurti/torrents/downloads:/downloads:Z + - /trayimurti/torrents/watch:/watch:Z ports: - 8001:9091 - 51411:51413