Skip to content

Commit 341c4e5

Browse files
mevdscheemevdschee
committed
update
1 parent 9d7a5c5 commit 341c4e5

File tree

9 files changed

+43
-89
lines changed

9 files changed

+43
-89
lines changed

‎README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,12 +1479,14 @@ The `customControllers` config supports a comma separated list of custom control
14791479

14801480
I am testing mainly on Ubuntu and I have the following test setups:
14811481

1482-
- (Docker) Ubuntu 18.04 with PHP 7.2, MySQL 5.7, PostgreSQL 10.4 (PostGIS 2.4) and SQLite 3.22
14831482
- (Docker) Debian 10 with PHP 7.3, MariaDB 10.3, PostgreSQL 11.4 (PostGIS 2.5) and SQLite 3.27
1484-
- (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
14851483
- (Docker) Debian 11 with PHP 7.4, MariaDB 10.5, PostgreSQL 13.4 (PostGIS 3.1) and SQLite 3.34
1486-
- (Docker) Ubuntu 22.04 with PHP 8.1, MySQL 8.0, PostgreSQL 14.2 (PostGIS 3.2) and SQLite 3.37
14871484
- (Docker) Debian 12 with PHP 8.2, MariaDB 10.11, PostgreSQL 15.3 (PostGIS 3.3) and SQLite 3.40
1485+
- (Docker) RockyLinux 8 with PHP 7.2, MariaDB 10.3 and SQLite 3.26
1486+
- (Docker) RockyLinux 9 with PHP 8.0, MariaDB 10.5 and SQLite 3.34
1487+
- (Docker) Ubuntu 18.04 with PHP 7.2, MySQL 5.7, PostgreSQL 10.4 (PostGIS 2.4) and SQLite 3.22
1488+
- (Docker) Ubuntu 20.04 with PHP 7.4, MySQL 8.0, PostgreSQL 12.15 (PostGIS 3.0) and SQLite 3.31 and SQL Server 2019
1489+
- (Docker) Ubuntu 22.04 with PHP 8.1, MySQL 8.0, PostgreSQL 14.2 (PostGIS 3.2) and SQLite 3.37
14881490

14891491
This covers not all environments (yet), so please notify me of failing tests and report your environment.
14901492
I will try to cover most relevant setups in the "docker" folder of the project.

‎docker/debian10/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ 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-
mariadb-server mariadb-client php-mysql \
9-
postgresql php-pgsql \
10-
postgresql-11-postgis-2.5 \
11-
sqlite3 php-sqlite3 \
12-
git wget
7+
php-cli php-xml php-mbstring \
8+
mariadb-server mariadb-client php-mysql \
9+
postgresql php-pgsql \
10+
postgresql-11-postgis-2.5 \
11+
sqlite3 php-sqlite3 \
12+
git wget
1313

1414
# install run script
1515
ADD run.sh /usr/sbin/docker-run

‎docker/debian11/Dockerfile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ 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-
mariadb-server mariadb-client php-mysql \
9-
postgresql php-pgsql \
10-
postgresql-13-postgis-3 \
11-
sqlite3 php-sqlite3 \
12-
git wget
7+
php-cli php-xml php-mbstring \
8+
mariadb-server mariadb-client php-mysql \
9+
postgresql php-pgsql \
10+
postgresql-13-postgis-3 \
11+
sqlite3 php-sqlite3 \
12+
git wget
1313

1414
# install run script
1515
ADD run.sh /usr/sbin/docker-run

‎docker/rockylinux8/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
FROM rockylinux:8
22

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-
93
RUN dnf -y install \
104
php-cli php-xml php-json php-mbstring \
115
mariadb-server mariadb php-mysqlnd \
12-
postgresql14-server postgresql14 php-pgsql \
13-
sqlite php-sqlite3 postgis32_14 \
6+
sqlite php-sqlite3 \
147
git wget
158

169
# install run script

‎docker/rockylinux8/run.sh

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
22
echo "================================================"
3-
echo " CentOS 8 (PHP 8.1)"
3+
echo " RockyLinux 8 (PHP 7.2)"
44
echo "================================================"
5-
echo -n "[1/4] Starting MariaDB 10.7 ..... "
5+
echo -n "[1/4] Starting MariaDB 10.3 ..... "
66
# initialize mysql
77
mysql_install_db > /dev/null
8-
chown -R mysql:mysql /var/lib/mysql
8+
chown -R mysql:mysql /var/log/mariadb /var/lib/mysql
99
# run mysql server
10-
nohup /usr/sbin/mysqld -u mysql > /root/mysql.log 2>&1 &
10+
nohup /usr/bin/mysqld_safe -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,25 +21,8 @@ FLUSH PRIVILEGES;
2121
EOF
2222
echo "done"
2323

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
27-
# run postgres server
28-
nohup su - -c "/usr/pgsql-12/bin/postgres -D /var/lib/pgsql/data" postgres > /root/postgres.log 2>&1 &
29-
# wait for postgres to become available
30-
until su - -c "psql -U postgres -c '\q'" postgres >/dev/null 2>&1; do
31-
sleep 1;
32-
done
33-
# create database and user on postgres
34-
su - -c "psql -U postgres >/dev/null" postgres << 'EOF'
35-
CREATE USER "php-crud-api" WITH PASSWORD 'php-crud-api';
36-
CREATE DATABASE "php-crud-api";
37-
GRANT ALL PRIVILEGES ON DATABASE "php-crud-api" to "php-crud-api";
38-
\c "php-crud-api";
39-
CREATE EXTENSION IF NOT EXISTS postgis;
40-
\q
41-
EOF
42-
echo "done"
24+
echo -n "[2/4] Starting PostgreSQL 11 .. "
25+
echo "skipped"
4326

4427
echo -n "[3/4] Starting SQLServer 2017 ... "
4528
echo "skipped"

‎docker/rockylinux9/Dockerfile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
FROM rockylinux:9
22

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-
93
RUN dnf -y install \
104
php-cli php-xml php-json php-mbstring \
115
mariadb-server mariadb php-mysqlnd \
12-
postgresql15-server postgresql15 php-pgsql \
13-
sqlite php-sqlite3 postgis33_15 \
6+
sqlite php-sqlite3 \
147
git wget
158

169
# install run script

‎docker/rockylinux9/run.sh

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
22
echo "================================================"
3-
echo " CentOS 8 (PHP 8.1)"
3+
echo " RockyLinux 9 (PHP 8.0)"
44
echo "================================================"
5-
echo -n "[1/4] Starting MariaDB 10.7 ..... "
5+
echo -n "[1/4] Starting MariaDB 10.5 ..... "
66
# initialize mysql
77
mysql_install_db > /dev/null
8-
chown -R mysql:mysql /var/lib/mysql
8+
chown -R mysql:mysql /var/log/mariadb /var/lib/mysql
99
# run mysql server
10-
nohup /usr/sbin/mysqld -u mysql > /root/mysql.log 2>&1 &
10+
nohup /usr/bin/mysqld_safe -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
@@ -22,24 +22,7 @@ EOF
2222
echo "done"
2323

2424
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
27-
# run postgres server
28-
nohup su - -c "/usr/pgsql-12/bin/postgres -D /var/lib/pgsql/data" postgres > /root/postgres.log 2>&1 &
29-
# wait for postgres to become available
30-
until su - -c "psql -U postgres -c '\q'" postgres >/dev/null 2>&1; do
31-
sleep 1;
32-
done
33-
# create database and user on postgres
34-
su - -c "psql -U postgres >/dev/null" postgres << 'EOF'
35-
CREATE USER "php-crud-api" WITH PASSWORD 'php-crud-api';
36-
CREATE DATABASE "php-crud-api";
37-
GRANT ALL PRIVILEGES ON DATABASE "php-crud-api" to "php-crud-api";
38-
\c "php-crud-api";
39-
CREATE EXTENSION IF NOT EXISTS postgis;
40-
\q
41-
EOF
42-
echo "done"
25+
echo "skipped"
4326

4427
echo -n "[3/4] Starting SQLServer 2017 ... "
4528
echo "skipped"

‎docker/ubuntu18/Dockerfile

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

55
# install: php / mysql / postgres / sqlite / tools
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-10-postgis-2.4 \
11-
sqlite3 php-sqlite3 \
12-
git wget
7+
php-cli php-xml php-mbstring \
8+
mysql-server mysql-client php-mysql \
9+
postgresql php-pgsql \
10+
postgresql-10-postgis-2.4 \
11+
sqlite3 php-sqlite3 \
12+
git wget
1313

1414
# install locales
1515
RUN apt-get -y install locales

‎docker/ubuntu22/Dockerfile

Lines changed: 7 additions & 7 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-14-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-14-postgis-3 \
11+
sqlite3 php-sqlite3 \
12+
git wget \
13+
curl gnupg
1414

1515
# install locales
1616
RUN apt-get -y install locales

0 commit comments

Comments
 (0)