Merge pull request #13 from tteck/dev

fixes + v2.9.15
This commit is contained in:
tteckster 2022-01-18 08:05:09 -05:00 committed by GitHub
commit 613d341392
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions

View File

@ -23,13 +23,17 @@ function msg() {
echo -e "$TEXT"
}
LASTCMD=""
WGETOPT="-t 1 -T 15 -q"
# Prepare 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
# Cleanup
apt-get remove --purge -y build-essential python3-dev git -qq &>/dev/null
apt-get autoremove -y -qq &>/dev/null
apt-get clean
# Update container OS
echo -e "${CHECKMARK} \e[1;92m Updating Container OS... \e[0m"
apt update &>/dev/null
apt-get -qqy upgrade &>/dev/null
# Install dependencies
echo -e "${CHECKMARK} \e[1;92m Installing Dependencies... \e[0m"
@ -66,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"
@ -78,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
@ -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/*
rm -rf /npm_setup.sh /var/{cache,log}/* /var/lib/apt/lists/*