Merge pull request #219 from linuxserver/code-server-php8-apt

standardize apt-get
This commit is contained in:
aptalca
2021-06-23 18:01:42 -04:00
committed by GitHub
3 changed files with 15 additions and 10 deletions
+10
View File
@@ -0,0 +1,10 @@
#!/usr/bin/with-contenv bash
ppa="ppa:ondrej/php"
if ! grep -q "^deb .*${ppa}" /etc/apt/sources.list /etc/apt/sources.list.d/*; then
echo "**** adding ppa ondrej/php ****"
if ! dpkg -l | grep software-properties-common > /dev/null; then
apt-get update && apt-get install -y software-properties-common
fi
add-apt-repository ${ppa} -y
fi
+3
View File
@@ -0,0 +1,3 @@
#!/usr/bin/with-contenv bash
apt-get update
+2 -10
View File
@@ -1,14 +1,6 @@
#!/usr/bin/with-contenv bash
echo "**** adding ppa ondrej/php ****"
apt-get update && apt-get install -y \
software-properties-common
ppa="ppa:ondrej/php"
if ! grep -q "^deb .*${ppa}" /etc/apt/sources.list /etc/apt/sources.list.d/*; then
add-apt-repository ${ppa} -y
fi
echo "**** installing php and composer ****"
apt-get update && apt-get install -y \
echo "**** installing php8 and composer ****"
apt-get install -y \
composer \
php8.0