From 42d7eb2b7f403c4d47b2634c346715835f15d594 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 18 Jan 2022 07:12:45 -0500 Subject: [PATCH 1/5] Update npm_setup.sh --- npm_setup.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/npm_setup.sh b/npm_setup.sh index e6ba9b97..11066355 100644 --- a/npm_setup.sh +++ b/npm_setup.sh @@ -23,13 +23,17 @@ function msg() { echo -e "$TEXT" } -LASTCMD="" -WGETOPT="-t 1 -T 15 -q" - - # Cleanup - apt-get remove --purge -y build-essential python3-dev git -qq &>/dev/null - apt-get autoremove -y -qq &>/dev/null - apt-get clean +# Prepare container OS +msg "Setting up container OS..." +sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen +locale-gen >/dev/null +apt-get -y purge openssh-{client,server} >/dev/null +apt-get autoremove >/dev/null + +# Update container OS +msg "Updating container OS..." +apt update &>/dev/null +apt-get -qqy upgrade &>/dev/null # Install dependencies echo -e "${CHECKMARK} \e[1;92m Installing Dependencies... \e[0m" @@ -204,4 +208,4 @@ systemctl start openresty systemctl start npm echo -e "${CHECKMARK} \e[1;92m Cleanup... \e[0m" -rm -rf /npm_setup.sh /var/{cache,log}/* /var/lib/apt/lists/* \ No newline at end of file +rm -rf /npm_setup.sh /var/{cache,log}/* /var/lib/apt/lists/* From 799397bbd1a4e26253d39bcb041d1f0cd240c2dc Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 18 Jan 2022 07:16:34 -0500 Subject: [PATCH 2/5] Update npm_setup.sh --- npm_setup.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/npm_setup.sh b/npm_setup.sh index 11066355..28600ce4 100644 --- a/npm_setup.sh +++ b/npm_setup.sh @@ -70,9 +70,9 @@ echo -e "${CHECKMARK} \e[1;92m Installing Yarn... \e[0m" npm install --global yarn &>/dev/null # Download nginx-proxy-manager source -echo -e "${CHECKMARK} \e[1;92m Downloading NPM v2.9.14... \e[0m" -wget https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.14 -O - | tar -xz &>/dev/null -cd ./nginx-proxy-manager-2.9.14 +echo -e "${CHECKMARK} \e[1;92m Downloading NPM v2.9.15... \e[0m" +wget https://codeload.github.com/NginxProxyManager/nginx-proxy-manager/tar.gz/v2.9.15 -O - | tar -xz &>/dev/null +cd ./nginx-proxy-manager-2.9.15 # Crate required symbolic links echo -e "${CHECKMARK} \e[1;92m Setting up Enviroment... \e[0m" @@ -82,8 +82,8 @@ ln -sf /usr/local/openresty/nginx/sbin/nginx /usr/sbin/nginx ln -sf /usr/local/openresty/nginx/ /etc/nginx # Update NPM version in package.json files -sed -i "s+0.0.0+#v2.9.14+g" backend/package.json -sed -i "s+0.0.0+#v2.9.14+g" frontend/package.json +sed -i "s+0.0.0+#v2.9.15+g" backend/package.json +sed -i "s+0.0.0+#v2.9.15+g" frontend/package.json # Fix nginx config files for use with openresty defaults sed -i 's+^daemon+#daemon+g' docker/rootfs/etc/nginx/nginx.conf From 00bd215b4165e331ef1509f4b1ab6a931ecafbff Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 18 Jan 2022 07:19:28 -0500 Subject: [PATCH 3/5] Update npm_container.sh --- npm_container.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm_container.sh b/npm_container.sh index 3f3e373e..3bdd0d8b 100644 --- a/npm_container.sh +++ b/npm_container.sh @@ -74,7 +74,7 @@ function load_module() { TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null -wget -qL https://raw.githubusercontent.com/tteck/Proxmox/wip/npm_setup.sh +wget -qL https://raw.githubusercontent.com/tteck/Proxmox/dev/npm_setup.sh load_module overlay @@ -156,4 +156,4 @@ pct push $CTID npm_setup.sh /npm_setup.sh -perms 755 pct exec $CTID /npm_setup.sh IP=$(pct exec $CTID ip a s dev eth0 | sed -n '/inet / s/\// /p' | awk '{print $2}') -info "Successfully created a NPM LXC to $CTID at IP Address ${IP}:81" \ No newline at end of file +info "Successfully created a NPM LXC to $CTID at IP Address ${IP}:81" From d2f641558bb230196f17e6b4b4a0ba23ea94d982 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 18 Jan 2022 07:55:07 -0500 Subject: [PATCH 4/5] Update npm_setup.sh --- npm_setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/npm_setup.sh b/npm_setup.sh index 28600ce4..8adba8aa 100644 --- a/npm_setup.sh +++ b/npm_setup.sh @@ -24,14 +24,14 @@ function msg() { } # Prepare container OS -msg "Setting up container OS..." +echo -e "${CHECKMARK} \e[1;92m Setting up Container OS... \e[0m" sed -i "/$LANG/ s/\(^# \)//" /etc/locale.gen locale-gen >/dev/null apt-get -y purge openssh-{client,server} >/dev/null apt-get autoremove >/dev/null # Update container OS -msg "Updating container OS..." +echo -e "${CHECKMARK} \e[1;92m Updating Container OS... \e[0m" apt update &>/dev/null apt-get -qqy upgrade &>/dev/null From 3804210089d76e3e8d7d95dc35af0170ff65ed71 Mon Sep 17 00:00:00 2001 From: tteckster Date: Tue, 18 Jan 2022 08:01:09 -0500 Subject: [PATCH 5/5] Update npm_container.sh --- npm_container.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm_container.sh b/npm_container.sh index 3bdd0d8b..48fa1eb1 100644 --- a/npm_container.sh +++ b/npm_container.sh @@ -74,7 +74,7 @@ function load_module() { TEMP_DIR=$(mktemp -d) pushd $TEMP_DIR >/dev/null -wget -qL https://raw.githubusercontent.com/tteck/Proxmox/dev/npm_setup.sh +wget -qL https://raw.githubusercontent.com/tteck/Proxmox/main/npm_setup.sh load_module overlay