mirror of
https://github.com/tteck/Proxmox.git
synced 2024-11-29 18:13:10 +01:00
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.
This commit is contained in:
parent
cb312d1f5b
commit
a22c3644a6
@ -46,7 +46,6 @@ function default_settings() {
|
|||||||
MAC=""
|
MAC=""
|
||||||
VLAN=""
|
VLAN=""
|
||||||
SSH="no"
|
SSH="no"
|
||||||
FUSE="no"
|
|
||||||
VERB="no"
|
VERB="no"
|
||||||
echo_default
|
echo_default
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,6 @@ function default_settings() {
|
|||||||
MAC=""
|
MAC=""
|
||||||
VLAN=""
|
VLAN=""
|
||||||
SSH="no"
|
SSH="no"
|
||||||
FUSE="no"
|
|
||||||
VERB="no"
|
VERB="no"
|
||||||
echo_default
|
echo_default
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,6 @@ function default_settings() {
|
|||||||
MAC=""
|
MAC=""
|
||||||
VLAN=""
|
VLAN=""
|
||||||
SSH="no"
|
SSH="no"
|
||||||
FUSE="no"
|
|
||||||
VERB="no"
|
VERB="no"
|
||||||
echo_default
|
echo_default
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,6 @@ function default_settings() {
|
|||||||
MAC=""
|
MAC=""
|
||||||
VLAN=""
|
VLAN=""
|
||||||
SSH="no"
|
SSH="no"
|
||||||
FUSE="no"
|
|
||||||
VERB="no"
|
VERB="no"
|
||||||
echo_default
|
echo_default
|
||||||
}
|
}
|
||||||
|
@ -46,7 +46,6 @@ function default_settings() {
|
|||||||
MAC=""
|
MAC=""
|
||||||
VLAN=""
|
VLAN=""
|
||||||
SSH="no"
|
SSH="no"
|
||||||
FUSE="no"
|
|
||||||
VERB="no"
|
VERB="no"
|
||||||
echo_default
|
echo_default
|
||||||
}
|
}
|
||||||
|
@ -22,16 +22,7 @@ msg_ok "Installed Dependencies"
|
|||||||
msg_info "Installing CasaOS (Patience)"
|
msg_info "Installing CasaOS (Patience)"
|
||||||
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
||||||
mkdir -p $(dirname $DOCKER_CONFIG_PATH)
|
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
|
echo -e '{\n "log-driver": "journald"\n}' > /etc/docker/daemon.json
|
||||||
fi
|
|
||||||
$STD bash <(curl -fsSL https://get.casaos.io/v0.4.1)
|
$STD bash <(curl -fsSL https://get.casaos.io/v0.4.1)
|
||||||
msg_ok "Installed CasaOS"
|
msg_ok "Installed CasaOS"
|
||||||
|
|
||||||
|
@ -31,16 +31,7 @@ DOCKER_COMPOSE_LATEST_VERSION=$(get_latest_release "docker/compose")
|
|||||||
msg_info "Installing Docker $DOCKER_LATEST_VERSION"
|
msg_info "Installing Docker $DOCKER_LATEST_VERSION"
|
||||||
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
||||||
mkdir -p $(dirname $DOCKER_CONFIG_PATH)
|
mkdir -p $(dirname $DOCKER_CONFIG_PATH)
|
||||||
if [ "$ST" == "yes" ]; then
|
echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json
|
||||||
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 sh <(curl -sSL https://get.docker.com)
|
$STD sh <(curl -sSL https://get.docker.com)
|
||||||
msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
|
msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
|
||||||
|
|
||||||
|
@ -42,16 +42,7 @@ PORTAINER_LATEST_VERSION=$(get_latest_release "portainer/portainer")
|
|||||||
msg_info "Installing Docker $DOCKER_LATEST_VERSION"
|
msg_info "Installing Docker $DOCKER_LATEST_VERSION"
|
||||||
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
||||||
mkdir -p $(dirname $DOCKER_CONFIG_PATH)
|
mkdir -p $(dirname $DOCKER_CONFIG_PATH)
|
||||||
if [ "$ST" == "yes" ]; then
|
echo -e '{\n "log-driver": "journald"\n}' >/etc/docker/daemon.json
|
||||||
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 sh <(curl -sSL https://get.docker.com)
|
$STD sh <(curl -sSL https://get.docker.com)
|
||||||
msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
|
msg_ok "Installed Docker $DOCKER_LATEST_VERSION"
|
||||||
|
|
||||||
|
@ -22,16 +22,7 @@ msg_ok "Installed Dependencies"
|
|||||||
msg_info "Installing Umbrel (Patience)"
|
msg_info "Installing Umbrel (Patience)"
|
||||||
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
DOCKER_CONFIG_PATH='/etc/docker/daemon.json'
|
||||||
mkdir -p $(dirname $DOCKER_CONFIG_PATH)
|
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
|
echo -e '{\n "log-driver": "journald"\n}' > /etc/docker/daemon.json
|
||||||
fi
|
|
||||||
$STD bash <(curl -fsSL https://umbrel.sh)
|
$STD bash <(curl -fsSL https://umbrel.sh)
|
||||||
systemctl daemon-reload
|
systemctl daemon-reload
|
||||||
$STD systemctl enable --now umbrel-startup.service
|
$STD systemctl enable --now umbrel-startup.service
|
||||||
|
@ -122,9 +122,6 @@ echo_default() {
|
|||||||
echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
|
echo -e "${DGN}Using MAC Address: ${BGN}Default${CL}"
|
||||||
echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
|
echo -e "${DGN}Using VLAN Tag: ${BGN}Default${CL}"
|
||||||
echo -e "${DGN}Enable Root SSH Access: ${BGN}No${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 "${DGN}Enable Verbose Mode: ${BGN}No${CL}"
|
||||||
echo -e "${BL}Creating a ${APP} LXC using the above default settings${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}"
|
echo -e "${DGN}Enable Root SSH Access: ${BGN}$SSH${CL}"
|
||||||
fi
|
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
|
if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "VERBOSE MODE" --yesno "Enable Verbose Mode?" 10 58); then
|
||||||
VERB="yes"
|
VERB="yes"
|
||||||
else
|
else
|
||||||
@ -475,21 +463,13 @@ start() {
|
|||||||
build_container() {
|
build_container() {
|
||||||
if [ "$VERB" == "yes" ]; then set -x; fi
|
if [ "$VERB" == "yes" ]; then set -x; fi
|
||||||
|
|
||||||
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
|
if [ "$CT_TYPE" == "1" ]; then
|
||||||
if [ "$FUSE" == "yes" ]; then
|
FEATURES="keyctl=1,nesting=1"
|
||||||
FEATURES="fuse=1,keyctl=1,nesting=1"
|
else
|
||||||
else
|
FEATURES="nesting=1"
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
TEMP_DIR=$(mktemp -d)
|
TEMP_DIR=$(mktemp -d)
|
||||||
pushd $TEMP_DIR >/dev/null
|
pushd $TEMP_DIR >/dev/null
|
||||||
if [ "$var_os" == "alpine" ]; then
|
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)"
|
export FUNCTIONS_FILE_PATH="$(curl -s https://raw.githubusercontent.com/tteck/Proxmox/main/misc/install.func)"
|
||||||
fi
|
fi
|
||||||
export tz="$timezone"
|
export tz="$timezone"
|
||||||
if [[ "$APP" == "Docker" || "$APP" == "Umbrel" || "$APP" == "CasaOS" || "$APP" == "Home Assistant" ]]; then
|
|
||||||
export ST="$FUSE"
|
|
||||||
fi
|
|
||||||
export DISABLEIPV6="$DISABLEIP6"
|
export DISABLEIPV6="$DISABLEIP6"
|
||||||
export APPLICATION="$APP"
|
export APPLICATION="$APP"
|
||||||
export app="$NSAPP"
|
export app="$NSAPP"
|
||||||
|
Loading…
Reference in New Issue
Block a user