pob
/
Proxmox_Scripts
mirror of https://github.com/tteck/Proxmox
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

drop fuse-overlayfs storage driver

Browse Source 
- 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.
pull/2189/head
tteckster 2 years ago committed by GitHub
parent cb312d1f5b
commit a22c3644a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      ct/casaos.sh
  2. 1
      ct/docker.sh
  3. 1
      ct/dockge.sh
  4. 1
      ct/homeassistant.sh
  5. 1
      ct/umbrel.sh
  6. 9
      install/casaos-install.sh
  7. 9
      install/docker-install.sh
  8. 9
      install/homeassistant-install.sh
  9. 9
      install/umbrel-install.sh
  10. 25
      misc/build.func

1
ct/casaos.sh
Unescape View File

@ -46,7 +46,6 @@ function default_settings() {
MAC=""
VLAN=""
SSH="no"
FUSE="no"
VERB="no"
echo_default
}

1
ct/docker.sh
Unescape View File

@ -46,7 +46,6 @@ function default_settings() {
MAC=""
VLAN=""
SSH="no"
FUSE="no"
VERB="no"
echo_default
}

1
ct/dockge.sh
Unescape View File

@ -46,7 +46,6 @@ function default_settings() {
MAC=""
VLAN=""
SSH="no"
FUSE="no"
VERB="no"
echo_default
}

1
ct/homeassistant.sh
Unescape View File

@ -46,7 +46,6 @@ function default_settings() {
MAC=""
VLAN=""
SSH="no"
FUSE="no"
VERB="no"
echo_default
}

1
ct/umbrel.sh
Unescape View File

@ -46,7 +46,6 @@ function default_settings() {
MAC=""
VLAN=""
SSH="no"
FUSE="no"
VERB="no"
echo_default
}

9
install/casaos-install.sh
Unescape View File

@ -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"

9
install/docker-install.sh
Unescape View File

@ -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
$STD sh <(curl -sSL https://get.docker.com)
msg_ok "Installed Docker $DOCKER_LATEST_VERSION"

9
install/homeassistant-install.sh
Unescape View File

@ -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
$STD sh <(curl -sSL https://get.docker.com)
msg_ok "Installed Docker $DOCKER_LATEST_VERSION"

9
install/umbrel-install.sh
Unescape View File

@ -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

25
misc/build.func
Unescape View File

@ -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,20 +463,12 @@ 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
fi
TEMP_DIR=$(mktemp -d)
pushd $TEMP_DIR >/dev/null
@ -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"

Write Preview
Loading…
Cancel
Save