Fixed FirstSetup and upgraded Alpine to 3.16 version

"FirstSetup": now installes go form official website

CT ElkarbackupALP: New use old stable repo(3.15) for php7 since is is obeleted in 3.16

CT HeimdallCT: Switched to php8 and when git cloing using 2.x branch instead of master
This commit is contained in:
2022-07-01 00:45:21 +02:00
parent 66e16943bc
commit 6c182a2ec7
6 changed files with 48 additions and 33 deletions

View File

@@ -1,6 +1,6 @@
image: image:
distribution: "alpinelinux" distribution: "alpinelinux"
release: "3.15" release: "3.16"
source: source:
downloader: alpinelinux-http downloader: alpinelinux-http
@@ -540,23 +540,23 @@ packages:
#PKGS for Elkarbackup #PKGS for Elkarbackup
- packages: - packages:
- rsnapshot - rsnapshot
- php7 - php7@CommunityOldStable
- php7-openssl - php7-openssl@CommunityOldStable
- php7-phar - php7-phar@CommunityOldStable
- php7-mbstring - php7-mbstring@CommunityOldStable
- php7-iconv - php7-iconv@CommunityOldStable
- php7-json - php7-json@CommunityOldStable
- php7-ctype - php7-ctype@CommunityOldStable
- php7-xml - php7-xml@CommunityOldStable
- php7-tokenizer - php7-tokenizer@CommunityOldStable
- php7-dom - php7-dom@CommunityOldStable
- php7-session - php7-session@CommunityOldStable
- php7-simplexml - php7-simplexml@CommunityOldStable
- php7-posix - php7-posix@CommunityOldStable
- php7-fpm - php7-fpm@CommunityOldStable
- php7-pdo_mysql - php7-pdo_mysql@CommunityOldStable
- php7-pcntl - php7-pcntl@CommunityOldStable
- php7-fileinfo - php7-fileinfo@CommunityOldStable
- coreutils - coreutils
- sudo - sudo
action: install action: install
@@ -566,6 +566,19 @@ packages:
#PKGS for Heimdall #PKGS for Heimdall
- packages: - packages:
- git - git
- php8
- php8-ctype
- php8-curl
- php8-pdo_sqlite
- php8-mbstring
- php8-json
- php8-zip
- php8-xml
- php8-fpm
- php8-session
- php8-openssl
- php8-tokenizer
action: install action: install
variants: variants:
- heimdall - heimdall
@@ -586,7 +599,7 @@ packages:
#EndREPOS #EndREPOS
{% if image.variant == "ddns" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %} {% if image.variant == "ddns" %}@TestingEdge http://dl-4.alpinelinux.org/alpine/edge/testing{% endif %}
{% if image.variant == "vouchproxy" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %} {% if image.variant == "vouchproxy" %}@CommunityEdge http://dl-4.alpinelinux.org/alpine/edge/community{% endif %}
{% if image.variant == "elkarbackupALP" %}@CommunityOldStable http://dl-4.alpinelinux.org/alpine/v3.15/community{% endif %}
actions: actions:
- trigger: post-unpack - trigger: post-unpack

View File

@@ -31,7 +31,7 @@ rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php #Configure Php
rm -rf /etc/php8/php-fpm.d/* rm -rf /etc/php7/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php7/php-fpm.d/elkarbackup.conf mv /opt/Setup/Configs/php.conf /etc/php7/php-fpm.d/elkarbackup.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php7/conf.d/04_date_timezone.ini mv /opt/Setup/Configs/phpTimezone.ini /etc/php7/conf.d/04_date_timezone.ini

View File

@@ -37,7 +37,7 @@ http {
} }
location ~ \.php$ { location ~ \.php$ {
include fastcgi_params; include fastcgi_params;
fastcgi_pass unix:/run/php-fpm7/php-fpm.sock; fastcgi_pass unix:/run/php-fpm8/php-fpm.sock;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php; fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

View File

@@ -1,7 +1,7 @@
[heimdall] [heimdall]
user = nginx user = nginx
group = nginx group = nginx
listen = /run/php-fpm7/php-fpm.sock listen = /run/php-fpm8/php-fpm.sock
listen.owner = nginx listen.owner = nginx
listen.group = nginx listen.group = nginx
php_admin_value[disable_functions] = exec,passthru,system php_admin_value[disable_functions] = exec,passthru,system
@@ -27,7 +27,7 @@ php_admin_value[max_input_time] = 15
php_admin_value[cgi.fix_pathinfo] = 0 php_admin_value[cgi.fix_pathinfo] = 0
php_admin_value[allow_url_fopen] = Off php_admin_value[allow_url_fopen] = Off
php_admin_value[file_uploads] = On php_admin_value[file_uploads] = On
php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm7/php-fpm.sock:/tmp php_admin_value[open_basedir] = /opt/heimdall:/run/php-fpm8/php-fpm.sock:/tmp
php_admin_value[session.use_strict_mode] = 1 php_admin_value[session.use_strict_mode] = 1
php_admin_value[session.cookie_httponly] = 1 php_admin_value[session.cookie_httponly] = 1

View File

@@ -1,22 +1,18 @@
#!/bin/ash #!/bin/ash
#Install php 7.3
echo "@phphernandev https://php.hernandev.com/v3.11/php-7.3" >> /etc/apk/repositories
curl -L https://php.hernandev.com/key/php-alpine.rsa.pub -o /etc/apk/keys/php-alpine.rsa.pub
apk add php7@phphernandev php7-ctype@phphernandev php7-curl@phphernandev php7-pdo_sqlite@phphernandev php7-mbstring@phphernandev php7-json@phphernandev php7-zip@phphernandev php7-xml@phphernandev php7-fpm@phphernandev php7-session@phphernandev php7-openssl@phphernandev
#Configure Nginx #Configure Nginx
rm -rf /etc/nginx/conf.d rm -rf /etc/nginx/conf.d
mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf mv /opt/Setup/Configs/nginx.conf /etc/nginx/nginx.conf
#Configure Php-Fpm #Configure Php-Fpm
rm -rf /etc/php7/php-fpm.d/* rm -rf /etc/php8/php-fpm.d/*
mv /opt/Setup/Configs/php.conf /etc/php7/php-fpm.d/heimdall.conf mv /opt/Setup/Configs/php.conf /etc/php8/php-fpm.d/heimdall.conf
mv /opt/Setup/Configs/phpTimezone.ini /etc/php7/conf.d/04_date_timezone.ini mv /opt/Setup/Configs/phpTimezone.ini /etc/php8/conf.d/04_date_timezone.ini
#Install Heimdall #Install Heimdall
git clone https://github.com/linuxserver/Heimdall.git /opt/heimdall git clone -b 2.x https://github.com/linuxserver/Heimdall.git /opt/heimdall
chown -R nginx:nginx /opt/heimdall chown -R nginx:nginx /opt/heimdall
#Enable services on boot #Enable services on boot
rc-update add nginx rc-update add nginx
rc-update add php-fpm7 rc-update add php-fpm8

View File

@@ -7,8 +7,14 @@ cd "$( cd "$( dirname "$0" )" &> /dev/null && pwd )/.."
echo "The script will now install required dependencies" echo "The script will now install required dependencies"
read -r -s -p $'Press enter to continue, or ctrl+c to quit' read -r -s -p $'Press enter to continue, or ctrl+c to quit'
#Install software dependencies #Install software dependencies
apt install ca-certificates golang git make debootstrap curl gcc libc-dev nano gnupg2 rsync xz-utils --no-install-recommends -y apt install ca-certificates git make debootstrap curl gcc libc-dev nano gnupg2 rsync xz-utils --no-install-recommends -y
#Install go
rm -rf /usr/local/go
curl -L https://go.dev/dl/go$(curl -Ls https://go.dev/VERSION?m=text |sed 's/go//g').linux-amd64.tar.gz -o /tmp/go.tar.gz
tar -C /usr/local -xzf /tmp/go.tar.gz
echo "export PATH=$PATH:/usr/local/go/bin" >> $HOME/.profile
export PATH=$PATH:/usr/local/go/bin
#Get Source for DistroBuilder #Get Source for DistroBuilder
git clone https://github.com/lxc/distrobuilder distrobuilderSRC git clone https://github.com/lxc/distrobuilder distrobuilderSRC