From a22c3644a69470af17bd60f6f56173b5eb248cb1 Mon Sep 17 00:00:00 2001 From: tteckster Date: Wed, 6 Dec 2023 20:13:12 -0500 Subject: [PATCH] drop fuse-overlayfs storage driver - As of Proxmox 8.1, `overlay2` is now a supported Docker storage driver when using ZFS, specifically with OpenZFS version 2.2.0 or later. --- ct/casaos.sh | 1 - ct/docker.sh | 1 - ct/dockge.sh | 1 - ct/homeassistant.sh | 1 - ct/umbrel.sh | 1 - install/casaos-install.sh | 9 --------- install/docker-install.sh | 11 +---------- install/homeassistant-install.sh | 11 +---------- install/umbrel-install.sh | 9 --------- misc/build.func | 33 +++++--------------------------- 10 files changed, 7 insertions(+), 71 deletions(-) diff --git a/ct/casaos.sh b/ct/casaos.sh index a6dab10d..ba4a5aed 100644 --- a/ct/casaos.sh +++ b/ct/casaos.sh @@ -46,7 +46,6 @@ function default_settings() { MAC="" VLAN="" SSH="no" - FUSE="no" VERB="no" echo_default } diff --git a/ct/docker.sh b/ct/docker.sh index db176aec..81a3a1dc 100644 --- a/ct/docker.sh +++ b/ct/docker.sh @@ -46,7 +46,6 @@ function default_settings() { MAC="" VLAN="" SSH="no" - FUSE="no" VERB="no" echo_default } diff --git a/ct/dockge.sh b/ct/dockge.sh index 64cc093e..fba046b6 100644 --- a/ct/dockge.sh +++ b/ct/dockge.sh @@ -46,7 +46,6 @@ function default_settings() { MAC="" VLAN="" SSH="no" - FUSE="no" VERB="no" echo_default } diff --git a/ct/homeassistant.sh b/ct/homeassistant.sh index 1298c150..2056f0d6 100644 --- a/ct/homeassistant.sh +++ b/ct/homeassistant.sh @@ -46,7 +46,6 @@ function default_settings() { MAC="" VLAN="" SSH="no" - FUSE="no" VERB="no" echo_default } diff --git a/ct/umbrel.sh b/ct/umbrel.sh index 2dd3c08f..d5992e0e 100644 --- a/ct/umbrel.sh +++ b/ct/umbrel.sh @@ -46,7 +46,6 @@ function default_settings() { MAC="" VLAN="" SSH="no" - FUSE="no" VERB="no" echo_default } diff --git a/install/casaos-install.sh b/install/casaos-install.sh index d3caecbc..05473132 100644 --- a/install/casaos-install.sh +++ b/install/casaos-install.sh @@ -22,16 +22,7 @@ msg_ok "Installed Dependencies" msg_info "Installing CasaOS (Patience)" DOCKER_CONFIG_PATH='/etc/docker/daemon.json' mkdir -p $(dirname $DOCKER_CONFIG_PATH) -if [ "$ST" == "yes" ]; then -VER=$(curl -s https://api.github.com/repos/containers/fuse-overlayfs/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') -cd /usr/local/bin -curl -sSL -o fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/$VER/fuse-overlayfs-x86_64 -chmod 755 /usr/local/bin/fuse-overlayfs -cd ~ -echo -e '{\n "storage-driver": "fuse-overlayfs",\n "log-driver": "journald"\n}' > /etc/docker/daemon.json -else echo -e '{\n "log-driver": "journald"\n}' > /etc/docker/daemon.json -fi $STD bash <(curl -fsSL https://get.casaos.io/v0.4.1) msg_ok "Installed CasaOS" diff --git a/install/docker-install.sh b/install/docker-install.sh index 1a15edb3..6425d48e 100644 --- a/install/docker-install.sh +++ b/install/docker-install.sh @@ -31,16 +31,7 @@ DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose") msg_info "Installing Docker $DOCKER_LATEST_VERSION" DOCKER_CONFIG_PATH='/etc/docker/daemon.json' mkdir -p $(dirname $DOCKER_CONFIG_PATH) -if [ "$ST" == "yes" ]; then - VER=$(curl -s https://api.github.com/repos/containers/fuse-overlayfs/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') - cd /usr/local/bin - curl -sSL -o fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/$VER/fuse-overlayfs-x86_64 - chmod 755 /usr/local/bin/fuse-overlayfs - cd ~ - echo -e '{\n "storage-driver": "fuse-overlayfs",\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -else - echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -fi +echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json $STD sh <(curl -sSL https://get.docker.com) msg_ok "Installed Docker $DOCKER_LATEST_VERSION" diff --git a/install/homeassistant-install.sh b/install/homeassistant-install.sh index 0c19ca6c..3609a358 100644 --- a/install/homeassistant-install.sh +++ b/install/homeassistant-install.sh @@ -42,16 +42,7 @@ PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer") msg_info "Installing Docker $DOCKER_LATEST_VERSION" DOCKER_CONFIG_PATH='/etc/docker/daemon.json' mkdir -p $(dirname $DOCKER_CONFIG_PATH) -if [ "$ST" == "yes" ]; then - VER=$(curl -s https://api.github.com/repos/containers/fuse-overlayfs/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') - cd /usr/local/bin - curl -sSL -o fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/$VER/fuse-overlayfs-x86_64 - chmod 755 /usr/local/bin/fuse-overlayfs - cd ~ - echo -e '{\n "storage-driver": "fuse-overlayfs",\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -else - echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json -fi +echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json $STD sh <(curl -sSL https://get.docker.com) msg_ok "Installed Docker $DOCKER_LATEST_VERSION" diff --git a/install/umbrel-install.sh b/install/umbrel-install.sh index ea4d17ba..db058225 100644 --- a/install/umbrel-install.sh +++ b/install/umbrel-install.sh @@ -22,16 +22,7 @@ msg_ok "Installed Dependencies" msg_info "Installing Umbrel (Patience)" DOCKER_CONFIG_PATH='/etc/docker/daemon.json' mkdir -p $(dirname $DOCKER_CONFIG_PATH) -if [ "$ST" == "yes" ]; then -VER=$(curl -s https://api.github.com/repos/containers/fuse-overlayfs/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }') -cd /usr/local/bin -curl -sSL -o fuse-overlayfs https://github.com/containers/fuse-overlayfs/releases/download/$VER/fuse-overlayfs-x86_64 -chmod 755 /usr/local/bin/fuse-overlayfs -cd ~ -echo -e '{\n "storage-driver": "fuse-overlayfs",\n "log-driver": "journald"\n}' > /etc/docker/daemon.json -else echo -e '{\n "log-driver": "journald"\n}' > /etc/docker/daemon.json -fi $STD bash <(curl -fsSL https://umbrel.sh) systemctl daemon-reload $STD systemctl enable --now umbrel-startup.service diff --git a/misc/build.func b/misc/build.func index e734fd1f..5656561d 100644 --- a/misc/build.func +++ b/misc/build.func @@ -122,9 +122,6 @@ echo_default() { echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}" echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}" echo -e "${DGN}Enable Root SSH Access: ${BGN}No${CL}" - if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then - echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}No${CL}" - fi echo -e "${DGN}Enable Verbose Mode: ${BGN}No${CL}" echo -e "${BL}Creating a ${APP} LXC using the above default settings${CL}" } @@ -403,15 +400,6 @@ advanced_settings() { echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}" fi - if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then - if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "FUSE OVERLAYFS" --yesno "(ZFS) Enable Fuse Overlayfs?" 10 58); then - FUSE="yes" - else - FUSE="no" - fi - echo -e "${DGN}Enable Fuse Overlayfs (ZFS): ${BGN}$FUSE${CL}" - fi - if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then VERB="yes" else @@ -475,21 +463,13 @@ start() { build_container() { if [ "$VERB" == "yes" ]; then set -x; fi - if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then - if [ "$FUSE" == "yes" ]; then - FEATURES="fuse=1,keyctl=1,nesting=1" - else - FEATURES="keyctl=1,nesting=1" - fi - fi - if [[ "$APP" != "Docker" && "$APP" != "Umbrel" && "$APP" != "CasaOS" && "$APP" != "Home Assistant" ]]; then - if [ "$CT_TYPE" == "1" ]; then - FEATURES="keyctl=1,nesting=1" - else - FEATURES="nesting=1" - fi + if [ "$CT_TYPE" == "1" ]; then + FEATURES="keyctl=1,nesting=1" + else + FEATURES="nesting=1" fi + TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null if [ "$var_os" == "alpine" ]; then @@ -498,9 +478,6 @@ build_container() { export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)" fi export tz="$timezone" - if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then - export ST="$FUSE" - fi export DISABLEIPV6="$DISABLEIP6" export APPLICATION="$APP" export app="$NSAPP"