|
@@ -41,6 +41,7 @@ SKIP_IMAGES=false
|
|
REPAIR=false
|
|
REPAIR=false
|
|
LOCALES=true
|
|
LOCALES=true
|
|
NO_SSH=false
|
|
NO_SSH=false
|
|
|
|
+OVERLAY=false
|
|
|
|
|
|
# Paths
|
|
# Paths
|
|
LOG_FILE="openpanel_install.log"
|
|
LOG_FILE="openpanel_install.log"
|
|
@@ -330,6 +331,9 @@ parse_args() {
|
|
SKIP_PANEL_CHECK=true
|
|
SKIP_PANEL_CHECK=true
|
|
SKIP_REQUIREMENTS=true
|
|
SKIP_REQUIREMENTS=true
|
|
;;
|
|
;;
|
|
|
|
+ --overlay2)
|
|
|
|
+ OVERLAY=true
|
|
|
|
+ ;;
|
|
--skip-firewall)
|
|
--skip-firewall)
|
|
SKIP_FIREWALL=true
|
|
SKIP_FIREWALL=true
|
|
;;
|
|
;;
|
|
@@ -740,13 +744,28 @@ configure_mysql() {
|
|
|
|
|
|
configure_docker() {
|
|
configure_docker() {
|
|
|
|
|
|
- # Docker
|
|
|
|
|
|
|
|
- debug_log "Changing default storage driver for Docker from 'overlay2' to 'devicemapper'.."
|
|
|
|
docker_daemon_json_path="/etc/docker/daemon.json"
|
|
docker_daemon_json_path="/etc/docker/daemon.json"
|
|
-
|
|
|
|
debug_log mkdir -p $(dirname "$docker_daemon_json_path")
|
|
debug_log mkdir -p $(dirname "$docker_daemon_json_path")
|
|
|
|
|
|
|
|
+ # Docker
|
|
|
|
+if [ "$OVERLAY" = true ]; then
|
|
|
|
+ debug_log "Setting default storage driver for Docker from to 'overlay2'.."
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ ### to be removed in 0.1.8
|
|
|
|
+ daemon_json_content='{
|
|
|
|
+ "storage-driver": "overlay2",
|
|
|
|
+ "log-driver": "local",
|
|
|
|
+ "log-opts": {
|
|
|
|
+ "max-size": "5m"
|
|
|
|
+ }
|
|
|
|
+ }'
|
|
|
|
+ echo "$daemon_json_content" > "$docker_daemon_json_path"
|
|
|
|
+ ###
|
|
|
|
+
|
|
|
|
+else
|
|
|
|
+ debug_log "Changing default storage driver for Docker from 'overlay2' to 'devicemapper'.."
|
|
|
|
|
|
|
|
|
|
### to be removed in 0.1.8
|
|
### to be removed in 0.1.8
|
|
@@ -760,10 +779,13 @@ configure_docker() {
|
|
echo "$daemon_json_content" > "$docker_daemon_json_path"
|
|
echo "$daemon_json_content" > "$docker_daemon_json_path"
|
|
###
|
|
###
|
|
|
|
|
|
|
|
+fi
|
|
|
|
+
|
|
|
|
|
|
# to be used in 0.1.8+
|
|
# to be used in 0.1.8+
|
|
#cp /usr/local/panel/conf/docker.daemon.json $docker_daemon_json_path
|
|
#cp /usr/local/panel/conf/docker.daemon.json $docker_daemon_json_path
|
|
|
|
|
|
|
|
+
|
|
echo -e "${GREEN}Docker is configured.${RESET}"
|
|
echo -e "${GREEN}Docker is configured.${RESET}"
|
|
debug_log systemctl daemon-reload
|
|
debug_log systemctl daemon-reload
|
|
systemctl restart docker
|
|
systemctl restart docker
|