Skip to content

Commit 75472a6

Browse files
committed
update
1 parent 9ac8a3e commit 75472a6

File tree

9 files changed

+58
-78
lines changed

9 files changed

+58
-78
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,11 +1480,9 @@ The `customControllers` config supports a comma separated list of custom control
14801480
I am testing mainly on Ubuntu and I have the following test setups:
14811481

14821482
- (Docker) Ubuntu 16.04 with PHP 7.0, MariaDB 10.0, PostgreSQL 9.5 (PostGIS 2.2) and SQL Server 2017
1483-
- (Docker) Debian 9 with PHP 7.0, MariaDB 10.1, PostgreSQL 9.6 (PostGIS 2.3) and SQLite 3.16
14841483
- (Docker) Ubuntu 18.04 with PHP 7.2, MySQL 5.7, PostgreSQL 10.4 (PostGIS 2.4) and SQLite 3.22
14851484
- (Docker) Debian 10 with PHP 7.3, MariaDB 10.3, PostgreSQL 11.4 (PostGIS 2.5) and SQLite 3.27
1486-
- (Docker) Ubuntu 20.04 with PHP 7.4, MySQL 8.0, PostgreSQL 12.2 (PostGIS 3.0) and SQL Server 2019 and SQLite 3.31
1487-
- (Docker) CentOS 8 with PHP 8.1, MariaDB 10.7, PostgreSQL 12.10 (PostGIS 3.0) and SQLite 3.26
1485+
- (Docker) Ubuntu 20.04 with PHP 7.4, MySQL 8.0, PostgreSQL 12.15 (PostGIS 3.0) and SQL Server 2019 and SQLite 3.31
14881486
- (Docker) Debian 11 with PHP 7.4, MariaDB 10.5, PostgreSQL 13.4 (PostGIS 3.1) and SQLite 3.34
14891487
- (Docker) Ubuntu 22.04 with PHP 8.1, MySQL 8.0, PostgreSQL 14.2 (PostGIS 3.2) and SQLite 3.37
14901488
- (Docker) Debian 12 with PHP 8.2, MariaDB 10.11, PostgreSQL 15.3 (PostGIS 3.3) and SQLite 3.40

docker/centos8/Dockerfile

Lines changed: 0 additions & 41 deletions
This file was deleted.

docker/clean_all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22
# Delete all containers
3-
docker rm $(docker ps -a -q)
3+
docker rm -f $(docker ps -a -q)
44
# Delete all images
5-
docker rmi $(docker images -q)
5+
docker rmi -f $(docker images -q)

docker/debian9/Dockerfile

Lines changed: 0 additions & 16 deletions
This file was deleted.

docker/rockylinux8/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM rockylinux:8
2+
3+
RUN dnf -y install 'dnf-command(config-manager)'
4+
RUN dnf config-manager --set-enabled powertools
5+
RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
6+
RUN dnf -qy module disable postgresql
7+
RUN dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
8+
9+
RUN dnf -y install \
10+
php-cli php-xml php-json php-mbstring \
11+
mariadb-server mariadb php-mysqlnd \
12+
postgresql14-server postgresql14 php-pgsql \
13+
sqlite php-sqlite3 postgis32_14 \
14+
git wget
15+
16+
# install run script
17+
ADD run.sh /usr/sbin/docker-run
18+
CMD docker-run
File renamed without changes.

docker/rockylinux9/Dockerfile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
FROM rockylinux:9
2+
3+
RUN dnf -y install 'dnf-command(config-manager)'
4+
RUN dnf config-manager --set-enabled crb
5+
RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
6+
RUN dnf -qy module disable postgresql
7+
RUN dnf install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-9-x86_64/pgdg-redhat-repo-latest.noarch.rpm
8+
9+
RUN dnf -y install \
10+
php-cli php-xml php-json php-mbstring \
11+
mariadb-server mariadb php-mysqlnd \
12+
postgresql15-server postgresql15 php-pgsql \
13+
sqlite php-sqlite3 postgis33_15 \
14+
git wget
15+
16+
# install run script
17+
ADD run.sh /usr/sbin/docker-run
18+
CMD docker-run

docker/debian9/run.sh renamed to docker/rockylinux9/run.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
22
echo "================================================"
3-
echo " Debian 9 (PHP 7.0)"
3+
echo " CentOS 8 (PHP 8.1)"
44
echo "================================================"
5-
6-
echo -n "[1/4] Starting MariaDB 10.1 ..... "
7-
# make sure mysql can create socket and lock
8-
mkdir /var/run/mysqld && chmod 777 /var/run/mysqld
5+
echo -n "[1/4] Starting MariaDB 10.7 ..... "
6+
# initialize mysql
7+
mysql_install_db > /dev/null
8+
chown -R mysql:mysql /var/lib/mysql
99
# run mysql server
10-
nohup mysqld > /root/mysql.log 2>&1 &
10+
nohup /usr/sbin/mysqld -u mysql > /root/mysql.log 2>&1 &
1111
# wait for mysql to become available
1212
while ! mysqladmin ping -hlocalhost >/dev/null 2>&1; do
1313
sleep 1
@@ -21,9 +21,11 @@ FLUSH PRIVILEGES;
2121
EOF
2222
echo "done"
2323

24-
echo -n "[2/4] Starting PostgreSQL 9.6 ... "
24+
echo -n "[2/4] Starting PostgreSQL 12.10 .. "
25+
# initialize postgresql
26+
su - -c "/usr/pgsql-12/bin/initdb --auth-local peer --auth-host password -D /var/lib/pgsql/data" postgres > /dev/null
2527
# run postgres server
26-
nohup su - -c "/usr/lib/postgresql/9.6/bin/postgres -D /etc/postgresql/9.6/main" postgres > /root/postgres.log 2>&1 &
28+
nohup su - -c "/usr/pgsql-12/bin/postgres -D /var/lib/pgsql/data" postgres > /root/postgres.log 2>&1 &
2729
# wait for postgres to become available
2830
until su - -c "psql -U postgres -c '\q'" postgres >/dev/null 2>&1; do
2931
sleep 1;

docker/ubuntu20/Dockerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ ARG DEBIAN_FRONTEND=noninteractive
44

55
# install: php / mysql / postgres / sqlite / tools / mssql deps
66
RUN apt-get update && apt-get -y install \
7-
php-cli php-xml php-mbstring \
8-
mysql-server mysql-client php-mysql \
9-
postgresql php-pgsql \
10-
postgresql-12-postgis-3 \
11-
sqlite3 php-sqlite3 \
12-
git wget \
13-
curl gnupg
7+
php-cli php-xml php-mbstring \
8+
mysql-server mysql-client php-mysql \
9+
postgresql php-pgsql \
10+
postgresql-12-postgis-3 \
11+
sqlite3 php-sqlite3 \
12+
git wget \
13+
curl gnupg
1414

1515
# adding custom MS repository
1616
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
@@ -24,7 +24,8 @@ RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
2424

2525
# install pdo_sqlsrv
2626
RUN apt-get -y install php-pear build-essential unixodbc-dev php-dev
27-
RUN pecl install pdo_sqlsrv
27+
RUN pecl channel-update pecl.php.net
28+
RUN pecl install pdo_sqlsrv-5.10.1
2829
RUN echo extension=pdo_sqlsrv.so > /etc/php/7.4/mods-available/pdo_sqlsrv.ini
2930
RUN phpenmod pdo_sqlsrv
3031

0 commit comments

Comments
 (0)