Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add build 8.1 #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
!freetds.conf
!openssl.cnf
!7*.sh
!8*.sh
!prestissimo.sh
196 changes: 0 additions & 196 deletions 8.0

This file was deleted.

8 changes: 8 additions & 0 deletions 8.1-cli
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM php:8.1-cli

COPY 8.1.sh /tmp

RUN chmod +x /tmp/8.1.sh && /tmp/8.1.sh

COPY freetds.conf /etc/freetds/freetds.conf
COPY openssl.cnf /etc/ssl/openssl.cnf
10 changes: 10 additions & 0 deletions 8.1-fpm
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM php:8.1-fpm

COPY 8.1.sh /tmp

RUN chmod +x /tmp/8.1.sh \
&& /tmp/8.1.sh \
&& echo "\nCPTimeout=300\n\n[ODBC]\nPooling=Yes" >> /etc/odbcinst.ini

COPY freetds.conf /etc/freetds/freetds.conf
COPY openssl.cnf /etc/ssl/openssl.cnf
26 changes: 26 additions & 0 deletions 8.1.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
set -x \
&& apt update \
&& apt install --no-install-recommends -y zip git wget unzip gnupg2 locales apt-transport-https libpng-dev libwebp-dev libfreetype6-dev libjpeg62-turbo-dev libzip-dev zlib1g-dev libpq-dev libxml2-dev uuid-dev librabbitmq-dev unixodbc-dev libsybdb5 freetds-dev \
&& ln -s /usr/lib/x86_64-linux-gnu/libsybdb.so /usr/lib/ \
&& echo "en_US.UTF-8 UTF-8" > /etc/locale.gen \
&& locale-gen \
&& curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
&& curl https://packages.microsoft.com/config/debian/11/prod.list | tee /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update \
&& ACCEPT_EULA=Y apt-get install -y msodbcsql17 unixodbc-dev \
&& docker-php-ext-configure gd --enable-gd --with-freetype --with-jpeg --with-webp \
&& docker-php-ext-configure mysqli --with-mysqli=mysqlnd \
&& docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
&& docker-php-ext-configure zip --with-zip \
&& docker-php-source extract \
&& curl -fsSL https://raw.githubusercontent.com/php/php-src/6a6c8a60965c6fc3f145870a49b13b719ebd4a72/ext/sockets/config.m4 -o /usr/src/php/ext/sockets/config.m4 \
&& docker-php-ext-install sockets \
&& docker-php-ext-install -j $(nproc) gd zip intl soap pcntl mysqli bcmath opcache pdo_pgsql pdo_dblib \
&& pecl install redis uuid mongodb amqp sqlsrv-5.10.0 pdo_sqlsrv-5.10.0 \
&& docker-php-ext-enable uuid redis mongodb amqp pdo_dblib sqlsrv pdo_sqlsrv \
&& mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
&& sed -i -e 's/expose_php = On/expose_php = Off/' "$PHP_INI_DIR/php.ini" \
&& echo "\nCPTimeout=300\n\n[ODBC]\nPooling=Yes" >> /etc/odbcinst.ini \
&& php -m \
&& php -v \
php -i
8 changes: 4 additions & 4 deletions build-images-v8.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
VERSIONS="8.0"
VARIATIONS="cli-buster fpm-buster"
TAGS="cli fpm"
VERSIONS="8.1"
VARIATIONS="fpm cli"
TAGS="fpm cli"

for version in $VERSIONS; do
for variation in $VARIATIONS; do
Expand All @@ -10,7 +10,7 @@ done

for version in $VERSIONS; do
for tag in $TAGS; do
docker build -t "eduzz/php:$version-$tag" -f $version .
docker build -t "eduzz/php:$version-$tag" -f "$version-$tag" .
done
done

Expand Down
2 changes: 1 addition & 1 deletion build-images.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSIONS="7.4 7.3 7.2"
VERSIONS="7.4 7.3 7.2 8.1"
VARIATIONS="cli fpm"
TAGS="cli fpm cli-build"

Expand Down
6 changes: 2 additions & 4 deletions openssl.cnf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
openssl_conf = default_conf
#
# OpenSSL example configuration file.
# This is mostly being used for generation of certificate requests.
Expand All @@ -15,9 +16,6 @@ HOME = .
#oid_file = $ENV::HOME/.oid
oid_section = new_oids

# System default
openssl_conf = default_conf

# To use this configuration file with the "-extfile" option of the
# "openssl x509" utility, name here the section containing the
# X.509v3 extensions to use:
Expand Down Expand Up @@ -358,5 +356,5 @@ ssl_conf = ssl_sect
system_default = system_default_sect

[system_default_sect]
MinProtocol = TLSv1.0
MinProtocol = TLSv1
CipherString = DEFAULT@SECLEVEL=1