Merge pull request #189 from actions/users/shsamy/fixHistoryOrdering

Users/shsamy/fix history ordering
This commit is contained in:
Shady Youssef Ibraheem
2019-12-19 16:23:56 -05:00
committed by GitHub
6 changed files with 527 additions and 457 deletions

View File

@@ -121,12 +121,11 @@ compiled using version 3.0.0.0 of the Cabal library )
- Azul Zulu OpenJDK (11) (openjdk version "11.0.5" 2019-10-15 LTS) - Azul Zulu OpenJDK (11) (openjdk version "11.0.5" 2019-10-15 LTS)
- Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16) - Azul Zulu OpenJDK (12) (openjdk version "12.0.2" 2019-07-16)
- Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019) - Ant (Apache Ant(TM) version 1.10.5 compiled on March 28 2019)
- Gradle 6.0.1 - Gradle 5.6.2
- Maven (Apache Maven 3.6.2 (40f52333136460af0dc0d7232c0dc0bcf0d9e117; 2019-08-27T15:06:16Z)) - Maven (Apache Maven 3.6.1 (d66c9c0b3152b2e69ee9bac180bb8fcc8e6af555; 2019-04-04T19:00:29Z))
- Kind (v0.5.1) - kubectl (Client Version: v1.16.0)
- kubectl (Client Version: v1.16.3) - helm (Client: v2.14.3+g0e7f3b6)
- helm (Client: v2.16.1+gbbdfe5e) - Leiningen (Leiningen 2.9.1 on Java 1.8.0_222 OpenJDK 64-Bit Server VM)
- Leiningen (Leiningen 2.9.1 on Java 1.8.0_232 OpenJDK 64-Bit Server VM)
- Mercurial (Mercurial Distributed SCM (version 4.5.3)) - Mercurial (Mercurial Distributed SCM (version 4.5.3))
- Miniconda (conda 4.7.12) - Miniconda (conda 4.7.12)
- Mono (Mono JIT compiler version 6.4.0.198 (tarball Tue Sep 24 01:21:28 UTC 2019)) - Mono (Mono JIT compiler version 6.4.0.198 (tarball Tue Sep 24 01:21:28 UTC 2019))

View File

@@ -1,268 +1,302 @@
#!/bin/bash #!/bin/bash
################################################################################ ################################################################################
## File: php.sh ## File: php.sh
## Desc: Installs php ## Desc: Installs php
################################################################################ ################################################################################
# Source the helpers for use with the script # Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
LSB_RELEASE=$(lsb_release -rs) LSB_RELEASE=$(lsb_release -rs)
set -e set -e
apt-add-repository ppa:ondrej/php -y apt-add-repository ppa:ondrej/php -y
# Install php5.6 # Install php5.6
apt-get update apt-get update
apt-fast install -y --no-install-recommends \ apt-fast install -y --no-install-recommends \
php5.6 \ php5.6 \
php5.6-amqp \ php5.6-bcmath \
php5.6-bcmath \ php5.6-bz2 \
php5.6-bz2 \ php5.6-cgi \
php5.6-cgi \ php5.6-cli \
php5.6-cli \ php5.6-common \
php5.6-common \ php5.6-curl \
php5.6-curl \ php5.6-dba \
php5.6-dba \ php5.6-dev \
php5.6-dev \ php5.6-enchant \
php5.6-enchant \ php5.6-fpm \
php5.6-fpm \ php5.6-gd \
php5.6-gd \ php5.6-gmp \
php5.6-gmp \ php5.6-imap \
php5.6-imap \ php5.6-interbase \
php5.6-interbase \ php5.6-intl \
php5.6-intl \ php5.6-json \
php5.6-json \ php5.6-ldap \
php5.6-ldap \ php5.6-mbstring \
php5.6-mbstring \ php5.6-mcrypt \
php5.6-mcrypt \ php5.6-mysql \
php5.6-mysql \ php5.6-odbc \
php5.6-odbc \ php5.6-opcache \
php5.6-opcache \ php5.6-pgsql \
php5.6-pgsql \ php5.6-phpdbg \
php5.6-phpdbg \ php5.6-pspell \
php5.6-pspell \ php5.6-readline \
php5.6-readline \ php5.6-recode \
php5.6-recode \ php5.6-snmp \
php5.6-snmp \ php5.6-soap \
php5.6-soap \ php5.6-sqlite3 \
php5.6-sqlite3 \ php5.6-sybase \
php5.6-sybase \ php5.6-tidy \
php5.6-tidy \ php5.6-xml \
php5.6-xml \ php5.6-xmlrpc \
php5.6-xmlrpc \ php5.6-xsl \
php5.6-xsl \ php5.6-zip
php5.6-zip apt-get remove --purge -yq php5.6-dev
apt-get remove --purge -yq php5.6-dev
# Install php7.0
# Install php7.0 apt-fast install -y --no-install-recommends \
apt-fast install -y --no-install-recommends \ php7.0 \
php7.0 \ php7.0-bcmath \
php7.0-amqp \ php7.0-bz2 \
php7.0-bcmath \ php7.0-cgi \
php7.0-bz2 \ php7.0-cli \
php7.0-cgi \ php7.0-common \
php7.0-cli \ php7.0-curl \
php7.0-common \ php7.0-dba \
php7.0-curl \ php7.0-dev \
php7.0-dba \ php7.0-enchant \
php7.0-dev \ php7.0-fpm \
php7.0-enchant \ php7.0-gd \
php7.0-fpm \ php7.0-gmp \
php7.0-gd \ php7.0-imap \
php7.0-gmp \ php7.0-interbase \
php7.0-imap \ php7.0-intl \
php7.0-interbase \ php7.0-json \
php7.0-intl \ php7.0-ldap \
php7.0-json \ php7.0-mbstring \
php7.0-ldap \ php7.0-mcrypt \
php7.0-mbstring \ php7.0-mysql \
php7.0-mcrypt \ php7.0-odbc \
php7.0-mysql \ php7.0-opcache \
php7.0-odbc \ php7.0-pgsql \
php7.0-opcache \ php7.0-phpdbg \
php7.0-pgsql \ php7.0-pspell \
php7.0-phpdbg \ php7.0-readline \
php7.0-pspell \ php7.0-recode \
php7.0-readline \ php7.0-snmp \
php7.0-recode \ php7.0-soap \
php7.0-snmp \ php7.0-sqlite3 \
php7.0-soap \ php7.0-sybase \
php7.0-sqlite3 \ php7.0-tidy \
php7.0-sybase \ php7.0-xml \
php7.0-tidy \ php7.0-xmlrpc \
php7.0-xml \ php7.0-xsl \
php7.0-xmlrpc \ php7.0-zip
php7.0-xsl \ apt-get remove --purge -yq php7.0-dev
php7.0-zip
apt-get remove --purge -yq php7.0-dev # Install php7.1
apt-fast install -y --no-install-recommends \
# Install php7.1 php7.1 \
apt-fast install -y --no-install-recommends \ php7.1-bcmath \
php7.1 \ php7.1-bz2 \
php7.1-amqp \ php7.1-cgi \
php7.1-bcmath \ php7.1-cli \
php7.1-bz2 \ php7.1-common \
php7.1-cgi \ php7.1-curl \
php7.1-cli \ php7.1-dba \
php7.1-common \ php7.1-dev \
php7.1-curl \ php7.1-enchant \
php7.1-dba \ php7.1-fpm \
php7.1-dev \ php7.1-gd \
php7.1-enchant \ php7.1-gmp \
php7.1-fpm \ php7.1-imap \
php7.1-gd \ php7.1-interbase \
php7.1-gmp \ php7.1-intl \
php7.1-imap \ php7.1-json \
php7.1-interbase \ php7.1-ldap \
php7.1-intl \ php7.1-mbstring \
php7.1-json \ php7.1-mcrypt \
php7.1-ldap \ php7.1-mysql \
php7.1-mbstring \ php7.1-odbc \
php7.1-mcrypt \ php7.1-opcache \
php7.1-mysql \ php7.1-pgsql \
php7.1-odbc \ php7.1-phpdbg \
php7.1-opcache \ php7.1-pspell \
php7.1-pgsql \ php7.1-readline \
php7.1-phpdbg \ php7.1-recode \
php7.1-pspell \ php7.1-snmp \
php7.1-readline \ php7.1-soap \
php7.1-recode \ php7.1-sqlite3 \
php7.1-snmp \ php7.1-sybase \
php7.1-soap \ php7.1-tidy \
php7.1-sqlite3 \ php7.1-xml \
php7.1-sybase \ php7.1-xmlrpc \
php7.1-tidy \ php7.1-xsl \
php7.1-xml \ php7.1-zip
php7.1-xmlrpc \ apt-get remove --purge -yq php7.1-dev
php7.1-xsl \
php7.1-zip # Install php7.2
apt-get remove --purge -yq php7.1-dev apt-fast install -y --no-install-recommends \
php7.2 \
# Install php7.2 php7.2-bcmath \
apt-fast install -y --no-install-recommends \ php7.2-bz2 \
php7.2 \ php7.2-cgi \
php7.2-apcu \ php7.2-cli \
php7.2-amqp \ php7.2-common \
php7.2-bcmath \ php7.2-curl \
php7.2-bz2 \ php7.2-dba \
php7.2-cgi \ php7.2-dev \
php7.2-cli \ php7.2-enchant \
php7.2-common \ php7.2-fpm \
php7.2-curl \ php7.2-gd \
php7.2-dba \ php7.2-gmp \
php7.2-dev \ php7.2-imap \
php7.2-enchant \ php7.2-interbase \
php7.2-fpm \ php7.2-intl \
php7.2-gd \ php7.2-json \
php7.2-gmp \ php7.2-ldap \
php7.2-imap \ php7.2-mbstring \
php7.2-interbase \ php7.2-mysql \
php7.2-intl \ php7.2-odbc \
php7.2-json \ php7.2-opcache \
php7.2-ldap \ php7.2-pgsql \
php7.2-mbstring \ php7.2-phpdbg \
php7.2-mysql \ php7.2-pspell \
php7.2-odbc \ php7.2-readline \
php7.2-opcache \ php7.2-recode \
php7.2-pgsql \ php7.2-snmp \
php7.2-phpdbg \ php7.2-soap \
php7.2-pspell \ php7.2-sqlite3 \
php7.2-readline \ php7.2-sybase \
php7.2-recode \ php7.2-tidy \
php7.2-snmp \ php7.2-xml \
php7.2-soap \ php7.2-xmlrpc \
php7.2-sqlite3 \ php7.2-xsl \
php7.2-sybase \ php7.2-zip
php7.2-tidy \
php7.2-xml \ # Install php7.3
php7.2-xmlrpc \ apt-fast install -y --no-install-recommends \
php7.2-xsl \ php7.3 \
php7.2-zip php7.3-bcmath \
php7.3-bz2 \
# Install php7.3 php7.3-cgi \
apt-fast install -y --no-install-recommends \ php7.3-cli \
php7.3 \ php7.3-common \
php7.3-apcu \ php7.3-curl \
php7.3-amqp \ php7.3-dba \
php7.3-bcmath \ php7.3-dev \
php7.3-bz2 \ php7.3-enchant \
php7.3-cgi \ php7.3-fpm \
php7.3-cli \ php7.3-gd \
php7.3-common \ php7.3-gmp \
php7.3-curl \ php7.3-imap \
php7.3-dba \ php7.3-interbase \
php7.3-dev \ php7.3-intl \
php7.3-enchant \ php7.3-json \
php7.3-fpm \ php7.3-ldap \
php7.3-gd \ php7.3-mbstring \
php7.3-gmp \ php7.3-mysql \
php7.3-imap \ php7.3-odbc \
php7.3-interbase \ php7.3-opcache \
php7.3-intl \ php7.3-pgsql \
php7.3-json \ php7.3-phpdbg \
php7.3-ldap \ php7.3-pspell \
php7.3-mbstring \ php7.3-readline \
php7.3-mysql \ php7.3-recode \
php7.3-odbc \ php7.3-snmp \
php7.3-opcache \ php7.3-soap \
php7.3-pgsql \ php7.3-sqlite3 \
php7.3-phpdbg \ php7.3-sybase \
php7.3-pspell \ php7.3-tidy \
php7.3-readline \ php7.3-xml \
php7.3-recode \ php7.3-xmlrpc \
php7.3-snmp \ php7.3-xsl \
php7.3-soap \ php7.3-zip
php7.3-sqlite3 \
php7.3-sybase \ # Install php7.4
php7.3-tidy \ apt-fast install -y --no-install-recommends \
php7.3-xml \ php7.4 \
php7.3-xmlrpc \ php7.4-bcmath \
php7.3-xsl \ php7.4-bz2 \
php7.3-zip php7.4-cgi \
php7.4-cli \
apt-fast install -y --no-install-recommends \ php7.4-common \
php-igbinary \ php7.4-curl \
php-memcache \ php7.4-dba \
php-memcached \ php7.4-dev \
php-mongodb \ php7.4-enchant \
php-redis \ php7.4-fpm \
php-xdebug \ php7.4-gd \
php-yaml \ php7.4-gmp \
php-zmq php7.4-imap \
php7.4-interbase \
apt-get remove --purge -yq php7.2-dev php7.4-intl \
php7.4-json \
apt-fast install -y --no-install-recommends snmp php7.4-ldap \
php7.4-mbstring \
# Install composer php7.4-mysql \
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php7.4-odbc \
php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" php7.4-opcache \
php composer-setup.php php7.4-pgsql \
sudo mv composer.phar /usr/bin/composer php7.4-phpdbg \
php -r "unlink('composer-setup.php');" php7.4-pspell \
php7.4-readline \
# Install phpunit (for PHP) php7.4-snmp \
wget -q -O phpunit https://phar.phpunit.de/phpunit-7.phar php7.4-soap \
chmod +x phpunit php7.4-sqlite3 \
mv phpunit /usr/local/bin/phpunit php7.4-sybase \
php7.4-tidy \
# Run tests to determine that the software installed as expected php7.4-xml \
echo "Testing to make sure that script performed as expected, and basic scenarios work" php7.4-xmlrpc \
for cmd in php php5.6 php7.0 php7.1 php7.2 php7.3 composer phpunit; do php7.4-xsl \
if ! command -v $cmd; then php7.4-zip
echo "$cmd was not installed"
exit 1 apt-fast install -y --no-install-recommends \
fi php-amqp \
done php-apcu \
php-igbinary \
# Document what was added to the image php-memcache \
echo "Lastly, documenting what we added to the metadata file" php-memcached \
DocumentInstalledItem "PHP 5.6 ($(php5.6 --version | head -n 1))" php-mongodb \
DocumentInstalledItem "PHP 7.0 ($(php7.0 --version | head -n 1))" php-redis \
DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))" php-xdebug \
DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))" php-yaml \
DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))" php-zmq
DocumentInstalledItem "Composer ($(composer --version))"
DocumentInstalledItem "PHPUnit ($(phpunit --version))" apt-get remove --purge -yq php7.2-dev
apt-fast install -y --no-install-recommends snmp
# Install composer
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
php composer-setup.php
sudo mv composer.phar /usr/bin/composer
php -r "unlink('composer-setup.php');"
# Install phpunit (for PHP)
wget -q -O phpunit https://phar.phpunit.de/phpunit-7.phar
chmod +x phpunit
mv phpunit /usr/local/bin/phpunit
# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
for cmd in php php5.6 php7.0 php7.1 php7.2 php7.3 php7.4 composer phpunit; do
if ! command -v $cmd; then
echo "$cmd was not installed"
exit 1
fi
done
# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "PHP 5.6 ($(php5.6 --version | head -n 1))"
DocumentInstalledItem "PHP 7.0 ($(php7.0 --version | head -n 1))"
DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))"
DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))"
DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))"
DocumentInstalledItem "PHP 7.4 ($(php7.4 --version | head -n 1))"
DocumentInstalledItem "Composer ($(composer --version))"
DocumentInstalledItem "PHPUnit ($(phpunit --version))"

View File

@@ -57,4 +57,4 @@ DocumentInstalledItem "Az Module (1.6.0)"
DocumentInstalledItem "Az Module (2.3.2)" DocumentInstalledItem "Az Module (2.3.2)"
DocumentInstalledItem "Az Module (2.6.0)" DocumentInstalledItem "Az Module (2.6.0)"
DocumentInstalledItem "Az Module (2.8.0)" DocumentInstalledItem "Az Module (2.8.0)"
DocumentInstalledItem "Az Module (3.1.0)" DocumentInstalledItem "Az Module (3.1.0)"

View File

@@ -1,181 +1,217 @@
#!/bin/bash #!/bin/bash
################################################################################ ################################################################################
## File: php.sh ## File: php.sh
## Desc: Installs php ## Desc: Installs php
################################################################################ ################################################################################
# Source the helpers for use with the script # Source the helpers for use with the script
source $HELPER_SCRIPTS/document.sh source $HELPER_SCRIPTS/document.sh
LSB_RELEASE=$(lsb_release -rs) LSB_RELEASE=$(lsb_release -rs)
set -e set -e
apt-add-repository ppa:ondrej/php -y apt-add-repository ppa:ondrej/php -y
# Install php7.1 # Install php7.1
apt-fast install -y --no-install-recommends \ apt-fast install -y --no-install-recommends \
php7.1 \ php7.1 \
php7.1-amqp \ php7.1-bcmath \
php7.1-bcmath \ php7.1-bz2 \
php7.1-bz2 \ php7.1-cgi \
php7.1-cgi \ php7.1-cli \
php7.1-cli \ php7.1-common \
php7.1-common \ php7.1-curl \
php7.1-curl \ php7.1-dba \
php7.1-dba \ php7.1-dev \
php7.1-dev \ php7.1-enchant \
php7.1-enchant \ php7.1-fpm \
php7.1-fpm \ php7.1-gd \
php7.1-gd \ php7.1-gmp \
php7.1-gmp \ php7.1-imap \
php7.1-imap \ php7.1-interbase \
php7.1-interbase \ php7.1-intl \
php7.1-intl \ php7.1-json \
php7.1-json \ php7.1-ldap \
php7.1-ldap \ php7.1-mbstring \
php7.1-mbstring \ php7.1-mcrypt \
php7.1-mcrypt \ php7.1-mysql \
php7.1-mysql \ php7.1-odbc \
php7.1-odbc \ php7.1-opcache \
php7.1-opcache \ php7.1-pgsql \
php7.1-pgsql \ php7.1-phpdbg \
php7.1-phpdbg \ php7.1-pspell \
php7.1-pspell \ php7.1-readline \
php7.1-readline \ php7.1-recode \
php7.1-recode \ php7.1-snmp \
php7.1-snmp \ php7.1-soap \
php7.1-soap \ php7.1-sqlite3 \
php7.1-sqlite3 \ php7.1-sybase \
php7.1-sybase \ php7.1-tidy \
php7.1-tidy \ php7.1-xml \
php7.1-xml \ php7.1-xmlrpc \
php7.1-xmlrpc \ php7.1-xsl \
php7.1-xsl \ php7.1-zip
php7.1-zip apt-get remove --purge -yq php7.1-dev
apt-get remove --purge -yq php7.1-dev
# Install php7.2
# Install php7.2 apt-fast install -y --no-install-recommends \
apt-fast install -y --no-install-recommends \ php7.2 \
php7.2 \ php7.2-bcmath \
php7.2-apcu \ php7.2-bz2 \
php7.2-amqp \ php7.2-cgi \
php7.2-bcmath \ php7.2-cli \
php7.2-bz2 \ php7.2-common \
php7.2-cgi \ php7.2-curl \
php7.2-cli \ php7.2-dba \
php7.2-common \ php7.2-dev \
php7.2-curl \ php7.2-enchant \
php7.2-dba \ php7.2-fpm \
php7.2-dev \ php7.2-gd \
php7.2-enchant \ php7.2-gmp \
php7.2-fpm \ php7.2-imap \
php7.2-gd \ php7.2-interbase \
php7.2-gmp \ php7.2-intl \
php7.2-imap \ php7.2-json \
php7.2-interbase \ php7.2-ldap \
php7.2-intl \ php7.2-mbstring \
php7.2-json \ php7.2-mysql \
php7.2-ldap \ php7.2-odbc \
php7.2-mbstring \ php7.2-opcache \
php7.2-mysql \ php7.2-pgsql \
php7.2-odbc \ php7.2-phpdbg \
php7.2-opcache \ php7.2-pspell \
php7.2-pgsql \ php7.2-readline \
php7.2-phpdbg \ php7.2-recode \
php7.2-pspell \ php7.2-snmp \
php7.2-readline \ php7.2-soap \
php7.2-recode \ php7.2-sqlite3 \
php7.2-snmp \ php7.2-sybase \
php7.2-soap \ php7.2-tidy \
php7.2-sqlite3 \ php7.2-xml \
php7.2-sybase \ php7.2-xmlrpc \
php7.2-tidy \ php7.2-xsl \
php7.2-xml \ php7.2-zip
php7.2-xmlrpc \
php7.2-xsl \ # Install php7.3
php7.2-zip apt-fast install -y --no-install-recommends \
php7.3 \
# Install php7.3 php7.3-bcmath \
apt-fast install -y --no-install-recommends \ php7.3-bz2 \
php7.3 \ php7.3-cgi \
php7.3-apcu \ php7.3-cli \
php7.3-amqp \ php7.3-common \
php7.3-bcmath \ php7.3-curl \
php7.3-bz2 \ php7.3-dba \
php7.3-cgi \ php7.3-dev \
php7.3-cli \ php7.3-enchant \
php7.3-common \ php7.3-fpm \
php7.3-curl \ php7.3-gd \
php7.3-dba \ php7.3-gmp \
php7.3-dev \ php7.3-imap \
php7.3-enchant \ php7.3-interbase \
php7.3-fpm \ php7.3-intl \
php7.3-gd \ php7.3-json \
php7.3-gmp \ php7.3-ldap \
php7.3-imap \ php7.3-mbstring \
php7.3-interbase \ php7.3-mysql \
php7.3-intl \ php7.3-odbc \
php7.3-json \ php7.3-opcache \
php7.3-ldap \ php7.3-pgsql \
php7.3-mbstring \ php7.3-phpdbg \
php7.3-mysql \ php7.3-pspell \
php7.3-odbc \ php7.3-readline \
php7.3-opcache \ php7.3-recode \
php7.3-pgsql \ php7.3-snmp \
php7.3-phpdbg \ php7.3-soap \
php7.3-pspell \ php7.3-sqlite3 \
php7.3-readline \ php7.3-sybase \
php7.3-recode \ php7.3-tidy \
php7.3-snmp \ php7.3-xml \
php7.3-soap \ php7.3-xmlrpc \
php7.3-sqlite3 \ php7.3-xsl \
php7.3-sybase \ php7.3-zip
php7.3-tidy \
php7.3-xml \ # Install php7.4
php7.3-xmlrpc \ apt-fast install -y --no-install-recommends \
php7.3-xsl \ php7.4 \
php7.3-zip php7.4-bcmath \
php7.4-bz2 \
apt-fast install -y --no-install-recommends \ php7.4-cgi \
php-igbinary \ php7.4-cli \
php-memcache \ php7.4-common \
php-memcached \ php7.4-curl \
php-mongodb \ php7.4-dba \
php-redis \ php7.4-dev \
php-xdebug \ php7.4-enchant \
php-yaml \ php7.4-fpm \
php-zmq php7.4-gd \
php7.4-gmp \
apt-get remove --purge -yq php7.2-dev php7.4-imap \
php7.4-interbase \
apt-fast install -y --no-install-recommends snmp php7.4-intl \
php7.4-json \
# Install composer php7.4-ldap \
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" php7.4-mbstring \
php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" php7.4-mysql \
php composer-setup.php php7.4-odbc \
sudo mv composer.phar /usr/bin/composer php7.4-opcache \
php -r "unlink('composer-setup.php');" php7.4-pgsql \
php7.4-phpdbg \
# Install phpunit (for PHP) php7.4-pspell \
wget -q -O phpunit https://phar.phpunit.de/phpunit-7.phar php7.4-readline \
chmod +x phpunit php7.4-snmp \
mv phpunit /usr/local/bin/phpunit php7.4-soap \
php7.4-sqlite3 \
# Run tests to determine that the software installed as expected php7.4-sybase \
echo "Testing to make sure that script performed as expected, and basic scenarios work" php7.4-tidy \
for cmd in php php7.1 php7.2 php7.3 composer phpunit; do php7.4-xml \
if ! command -v $cmd; then php7.4-xmlrpc \
echo "$cmd was not installed" php7.4-xsl \
exit 1 php7.4-zip
fi
done apt-fast install -y --no-install-recommends \
php-amqp \
# Document what was added to the image php-apcu \
echo "Lastly, documenting what we added to the metadata file" php-igbinary \
DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))" php-memcache \
DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))" php-memcached \
DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))" php-mongodb \
DocumentInstalledItem "Composer ($(composer --version))" php-redis \
DocumentInstalledItem "PHPUnit ($(phpunit --version))" php-xdebug \
php-yaml \
php-zmq
apt-get remove --purge -yq php7.2-dev
apt-fast install -y --no-install-recommends snmp
# Install composer
php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
php -r "if (hash_file('sha384', 'composer-setup.php') === 'a5c698ffe4b8e849a443b120cd5ba38043260d5c4023dbf93e1558871f1f07f58274fc6f4c93bcfd858c6bd0775cd8d1') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
php composer-setup.php
sudo mv composer.phar /usr/bin/composer
php -r "unlink('composer-setup.php');"
# Install phpunit (for PHP)
wget -q -O phpunit https://phar.phpunit.de/phpunit-7.phar
chmod +x phpunit
mv phpunit /usr/local/bin/phpunit
# Run tests to determine that the software installed as expected
echo "Testing to make sure that script performed as expected, and basic scenarios work"
for cmd in php php7.1 php7.2 php7.3 php7.4 composer phpunit; do
if ! command -v $cmd; then
echo "$cmd was not installed"
exit 1
fi
done
# Document what was added to the image
echo "Lastly, documenting what we added to the metadata file"
DocumentInstalledItem "PHP 7.1 ($(php7.1 --version | head -n 1))"
DocumentInstalledItem "PHP 7.2 ($(php7.2 --version | head -n 1))"
DocumentInstalledItem "PHP 7.3 ($(php7.3 --version | head -n 1))"
DocumentInstalledItem "PHP 7.4 ($(php7.4 --version | head -n 1))"
DocumentInstalledItem "Composer ($(composer --version))"
DocumentInstalledItem "PHPUnit ($(phpunit --version))"

View File

@@ -6,7 +6,7 @@
Import-Module -Name ImageHelpers -Force Import-Module -Name ImageHelpers -Force
# .NET 4.8 Dev pack # .NET 4.8 Dev pack
$InstallerURI = "https://download.visualstudio.microsoft.com/download/pr/7afca223-55d2-470a-8edc-6a1739ae3252/c8c829444416e811be84c5765ede6148/NDP48-DevPack-ENU.exe" $InstallerURI = "https://download.visualstudio.microsoft.com/download/pr/014120d7-d689-4305-befd-3cb711108212/0307177e14752e359fde5423ab583e43/ndp48-devpack-enu.exe"
$InstallerName = "NDP48-DevPack-ENU.exe" $InstallerName = "NDP48-DevPack-ENU.exe"
$ArgumentList = ('Setup', '/passive', '/norestart' ) $ArgumentList = ('Setup', '/passive', '/norestart' )

View File

@@ -101,6 +101,7 @@ $WorkLoads = '--allWorkloads --includeRecommended ' + `
'--add Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.MFC.ARM.Spectre ' + `
'--add Microsoft.VisualStudio.Component.VC.MFC.ARM64 ' + ` '--add Microsoft.VisualStudio.Component.VC.MFC.ARM64 ' + `
'--add Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre ' + `
'--add Microsoft.VisualStudio.Component.VC.Redist.MSM ' + `
'--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre ' + `
'--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.Runtimes.ARM64.Spectre ' + `
'--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre ' + ` '--add Microsoft.VisualStudio.Component.VC.Runtimes.x86.x64.Spectre ' + `