Add php 8.2

garymengcom · garymengcom · commit efb3f67109af · 2024-10-02T08:30:58.000+04:00
diff --git a/docker-compose.sample.yml b/docker-compose.sample.yml
@@ -3,51 +3,38 @@ services:
   nginx:
     build:
       context: ./services/nginx
-      args:
-        NGINX_VERSION: nginx:${NGINX_VERSION}
-        CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
-        NGINX_INSTALL_APPS: ${NGINX_INSTALL_APPS}
     container_name: nginx
     ports:
-      - "${NGINX_HTTP_HOST_PORT}:80"
-      - "${NGINX_HTTPS_HOST_PORT}:443"
+      - "80:80"
+      - "443:443"
     volumes:
-      - ${SOURCE_DIR}:/www/:rw
-      - ${NGINX_SSL_CERTIFICATE_DIR}:/ssl:rw
-      - ${NGINX_CONFD_DIR}:/etc/nginx/conf.d/:rw
-      - ${NGINX_CONF_FILE}:/etc/nginx/nginx.conf:ro
-      - ${NGINX_FASTCGI_PHP_CONF}:/etc/nginx/fastcgi-php.conf:ro
-      - ${NGINX_FASTCGI_PARAMS}:/etc/nginx/fastcgi_params:ro
-      - ${NGINX_LOG_DIR}:/var/log/nginx/:rw
-    environment:
-      TZ: "$TZ"
+      - ./www:/www
+      - ./services/nginx/ssl:/ssl
+      - ./services/nginx/conf.d:/etc/nginx/conf.d
+      - ./services/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./services/nginx/fastcgi-php.conf:/etc/nginx/fastcgi-php.conf
+      - ./services/nginx/fastcgi_params:/etc/nginx/fastcgi_params
+      - ./logs/nginx:/var/log/nginx
     restart: always
     networks:
       - default
-      # 可以把-default 改成下列配置，以固定容器IP
-      #default:
-      #  ipv4_address: 10.0.0.10
 
-  php:
+  php82:
     build:
-      context: ./services/php
+      context: ./services/php82
       args:
-        PHP_VERSION: php:${PHP_VERSION}-fpm-alpine
         CONTAINER_PACKAGE_URL: ${CONTAINER_PACKAGE_URL}
-        COMPOSER_URL: ${COMPOSER_URL}
-        PHP_EXTENSIONS: ${PHP_EXTENSIONS}
-        TZ: "$TZ"
-    container_name: php
+        PHP_EXTENSIONS: pdo_mysql mysqli gd curl opcache
+        TZ: Asia/Dubai
+    container_name: php82
     expose:
       - 9501
-    extra_hosts:
-      - "www.site1.com:172.17.0.1"
     volumes:
-      - ${SOURCE_DIR}:/www/:rw
-      - ${PHP_PHP_CONF_FILE}:/usr/local/etc/php/php.ini:ro
-      - ${PHP_FPM_CONF_FILE}:/usr/local/etc/php-fpm.d/www.conf:rw
-      - ${PHP_LOG_DIR}:/var/log/php
-      - ${DATA_DIR}/composer:/tmp/composer
+      - ./www:/www
+      - ./services/php/php.ini:/usr/local/etc/php/php.ini
+      - ./services/php/php-fpm.conf:/usr/local/etc/php-fpm.d/www.conf
+      - ./logs/php82:/var/log/php
+      - ./data/composer:/tmp/composer
     restart: always
     cap_add:
       - SYS_PTRACE
diff --git a/services/nginx/Dockerfile b/services/nginx/Dockerfile
@@ -1,18 +1,3 @@
-ARG NGINX_VERSION
-FROM ${NGINX_VERSION}
-
-ARG TZ
-ARG NGINX_VERSION
-ARG CONTAINER_PACKAGE_URL
-ARG NGINX_INSTALL_APPS
-
-ENV INSTALL_APPS=",${NGINX_INSTALL_APPS},"
-
-RUN if [ "${CONTAINER_PACKAGE_URL}" != "" ] ; then sed -i "s/dl-cdn.alpinelinux.org/${CONTAINER_PACKAGE_URL}/g" /etc/apk/repositories ; fi
-
-RUN if [ -z "${INSTALL_APPS##*,certbot,*}" ]; then \
-        echo "---------- Install certbot ----------"; \
-        apk add --no-cache certbot; \
-    fi
+FROM nginx:1.26-alpine
 
 WORKDIR /www
diff --git a/services/nginx/conf.d/localhost.conf b/services/nginx/conf.d/localhost.conf
@@ -41,8 +41,10 @@ server {
 }
 
 server {
-    listen 443  default ssl http2;
     server_name  localhost;
+    listen 443 default ssl;
+    http2 on;
+
     root   /www/localhost;
     index  index.php index.html index.htm;
     #charset koi8-r;
@@ -72,7 +74,7 @@ server {
     # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
     #
     location ~ [^/]\.php(/|$) {
-        fastcgi_pass   php:9000;
+        fastcgi_pass   php82:9000;
         include        fastcgi-php.conf;
         include        fastcgi_params;
     }
diff --git a/services/nginx/ssl/localhost/localhost.crt b/services/nginx/ssl/localhost/localhost.crt
@@ -1,15 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICVTCCAb4CCQDAjEyILRN30zANBgkqhkiG9w0BAQsFADBvMQswCQYDVQQGEwJV
-UzENMAsGA1UECAwETWFyczETMBEGA1UEBwwKaVRyYW5zd2FycDETMBEGA1UECgwK
-aVRyYW5zd2FycDETMBEGA1UECwwKaVRyYW5zd2FycDESMBAGA1UEAwwJbG9jYWxo
-b3N0MB4XDTE4MDkyNTAyMzAyNVoXDTI4MDkyMjAyMzAyNVowbzELMAkGA1UEBhMC
-VVMxDTALBgNVBAgMBE1hcnMxEzARBgNVBAcMCmlUcmFuc3dhcnAxEzARBgNVBAoM
-CmlUcmFuc3dhcnAxEzARBgNVBAsMCmlUcmFuc3dhcnAxEjAQBgNVBAMMCWxvY2Fs
-aG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvF1hXtpa26dj8qKq4rQ8
-DYHC36UcghZp7JF8Q9M1ga4+R+M37Tt7rbkVSCbPfBYN0lGJ12CqQUye8wfJ/skr
-ol7KJcyfj5Z/z3IZSLegCOkJfxF5vNKzArbb+R2+ek2WdKuTGfOdbj07y1Q52HsS
-iOcrl7kUzmkYvxMEA2bqkPsCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAeuljNAc0b
-wNQCRRzJmfmW2I9kKGQVdHeJwzNE5D3jXlUbUXxBVpw5db548v6TSszicQV1nNav
-HiRQsQIbciSdRL7JFSFBbXURVD9LYu7SjtVb5sviZht1t47OpdT/GDYDkx40I3SK
-qtCcfeZ0GVupkCCZZM4C26hMZz+LVUaCmw==
+MIIDYTCCAkmgAwIBAgIUKZTVNpsZ7b3MupQoDcDM76YkaSUwDQYJKoZIhvcNAQEL
+BQAwWTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoM
+GEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MB4X
+DTI0MTAwMjA0MDIyMFoXDTI1MTAwMjA0MDIyMFowWTELMAkGA1UEBhMCQVUxEzAR
+BgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5
+IEx0ZDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAoheNl+kZcyqorYFvC/h7VAGpJ/lTszFI8aNSW2EFSNhxb6XZS4Rq
+7QxuTt6KQY1LmPAaq0tNWKq9eqn9FdcFE/LSfS832uGNiIkMYQzJeEhuhk2adeso
+IlDaSZCQXKV55wKdfwrUOhBSUByskGSBrbVrkMpKtJA+eedi1WcqisZUggxopjG5
+OZFccryC0QAEkEifNR5BGTFwUSLpm/0v2K77d+Roblt5lV+q5kpqgse8U8u0dswg
+jSX1BMsvwo8GRln7eGqyclFBF4pTDcvrlO36Sb4/cZ4LSP7+HegKPA42I1hXTRpf
+n7tmnZIGgRJkr5DDnUjwkSBfjByvZTkYLwIDAQABoyEwHzAdBgNVHQ4EFgQUVnN1
+3U5kv5TyQPtJnVHdRECkzyowDQYJKoZIhvcNAQELBQADggEBABYSf/XnFrOwK4xM
+956hKizLQfrzXbk90e0IideS6L/r62kxI1/ZDrMYveszE/1/7mVqaqxyIbs+w5Xr
+DX2/57K67OTLf7wmcHB93LXinA9zESMXp+2Q1n4yy9eULYgBDkcnxm+GsF33xRZ4
+X0rPhnKCgkoa2Z0sPIPhfoP7PDrSwaPBgJ+IpIn0PuwgFHDl8J71qCSWPK4VrONI
+Ms6UMF49UWMR4K/Jjemou3hM7TDp8NrxxrA7NIpXCRdP3sQInL+juPqqIjniJil2
+yu8fY0jzMfQzZO4qEDJwJEKolNOtHOkNh704WY/wgh0yaseOOriIeMjCE5wgt1to
+ljJgv2E=
 -----END CERTIFICATE-----
diff --git a/services/nginx/ssl/localhost/localhost.key b/services/nginx/ssl/localhost/localhost.key
@@ -1,15 +1,28 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQC8XWFe2lrbp2PyoqritDwNgcLfpRyCFmnskXxD0zWBrj5H4zft
-O3utuRVIJs98Fg3SUYnXYKpBTJ7zB8n+ySuiXsolzJ+Pln/PchlIt6AI6Ql/EXm8
-0rMCttv5Hb56TZZ0q5MZ851uPTvLVDnYexKI5yuXuRTOaRi/EwQDZuqQ+wIDAQAB
-AoGBALIcFiMLk1gZen+GYtFEnXgkF7FDPaagLP59PqQfhXue19M/vbU7RqIo3T/B
-OvXZIK6bXRxjkfl2yuGAnvalH/Shz/YdDtwtItgyYr4rteU5wJnPijPa2ebYXxNV
-wxq+9iyZs2vhhbbRGhFxREVE8iu2RnLY12CRxykGmxlWcNDZAkEA9CjA14Ym9gN/
-XwZ8PNe+a/2fe8U0O86VnanOK1G5k5dsZkOW0O/5u622rMlGJw/S+YCBJ+8sOhFL
-QTxlVGPCtQJBAMV/79lWoGBGnpoB+o9lc1nBUCCxGmVzywSOrTjIquwegTvjMUUM
-yoqEDWC4fNdoFtaFZ12tPk42NYC4BdbU4u8CQQCqOAdJurNK7GFOZH0VBewx6Z3Y
-ckHaOEpCovGjbdSNOxJNsW1huQxIdfFXQPNxpCyX2akxqCMTUJ9AmdSjIvHJAkEA
-qKajjpimwxALB8CA0krzwcWOQxx5SgEjcHTV/xN8wb0a5qUPwcM2gipZsipYkSlV
-t0KcDiaOegNYlN6QPe/1CQJBALtRggJf4bMgjG9vsz/zhe9egCtuUifKfo5LLvI+
-Xua1SY6XGL0Bf8TOGaNXc6Ye9H5abp7q/bZlZ+dGgJ3SJCY=
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCiF42X6RlzKqit
+gW8L+HtUAakn+VOzMUjxo1JbYQVI2HFvpdlLhGrtDG5O3opBjUuY8BqrS01Yqr16
+qf0V1wUT8tJ9Lzfa4Y2IiQxhDMl4SG6GTZp16ygiUNpJkJBcpXnnAp1/CtQ6EFJQ
+HKyQZIGttWuQykq0kD5552LVZyqKxlSCDGimMbk5kVxyvILRAASQSJ81HkEZMXBR
+Iumb/S/Yrvt35GhuW3mVX6rmSmqCx7xTy7R2zCCNJfUEyy/CjwZGWft4arJyUUEX
+ilMNy+uU7fpJvj9xngtI/v4d6Ao8DjYjWFdNGl+fu2adkgaBEmSvkMOdSPCRIF+M
+HK9lORgvAgMBAAECggEAR/Xa55EVulo67mRjD1ZuMhpWpad78Da2IoiWXHkTJobo
+vV9Mu8j6y2hUZHFJwdZftHML8/YHTZDnc9iZwiNmXrfTmL3otyShd/cX5tINc3f8
+kWVMaINQmwN4FWa3oFnaZ6Nyll8RXwG1+Vjxh10HcT30liAo0EalZetCpmkZquey
+tB3y+siaazkFWtVFayV9OCb9NUs6bzUAE1VnMEn854+G7b7pBtc6P2NtXoB+smTv
+nEIsCMtn9rkHeBd1GTUo1g9f+r/WoTRQi6lASbOJXJ+TktlsKy52RsVRbk/yudru
+AVi/nWJuilM3LQ7iIW2ptoo86l3uX68Od5ETbdGESQKBgQDVj+2w8bP73laOwnlq
+HCFQCgC/Go5rVp+o0wlvsvvlyRciGVtpHqjtkEev79SpO8up5b8Ar9gVyGCQ9uNO
+h6sikpAXB716FqW5JvIkWy6men+tbCs3JPLSFVmUgkNL079WrY7JcfOviHmHH7Vk
+sIMSIPbrsZGvVqGsWzt/Sq8Y6wKBgQDCTUu7MROW8UephKHf46UdMqEMNZ99ijEj
+1Si4SY1j6mfh+xoMApd2rW844VgZ9gNLtUcLVX1HS1AgxyWTNuAtDj8ydSpllVZu
+fDcLZcI5ZAP06Mr1Ct/8T/APOLc4iTfvjPTlrOMGqfzVYSRkpJgg+WaYbq/QNjcG
+H2IHOb1szQKBgQDD2fi7mw3aYC61QXgjbaTHSEUi/PG7UnedVdyDiXslYmNKrEJ+
+htWY+AYmPSWkBehi6QVfVeQvJdIZX7FZ5WV2kT5/QGPtwTM+N4889Do2BoVsv5Rq
+QAJH07iRT1zz/z6r+QLHjy9RvTDmUJgDvTSWvZB02iWmzSX7cLeBpzYo/QKBgFz3
+WN3W7HWTOmOMl1slc7IVsGLEIWySu1JWwiXy41jEJjJEz8ChWNEqyIWhpGK/h/Io
+aTauD8QV79/PCVZ3sik8oNZGoyN5oaI5gqjMZnLJPO9olvtJ2cPCh6zwyRGe7gmL
+Gv3ti657lQKPeTdCXZuhWQpkI3DvD8K5L1EfuledAoGAKfEz4IJpVN2BNSJKVSxG
+DYETKbjNutmUu15eK2Z6CxLXebbOtW8CmEdRn4qxlAuDN5mLSqAdv5UPXYM8pBSR
+UmBr8i4JSA02lhAxgDiTYa8bG3Yz1ahWF7ZtToD7TK5UaJK9AZN+UWx2HsdlPh5G
+WsIy/Tc+AIcJWzNvVZkaLHY=
+-----END PRIVATE KEY-----
diff --git a/services/php82/Dockerfile b/services/php82/Dockerfile
@@ -0,0 +1,33 @@
+ARG PHP_VERSION
+FROM php:8.2-fpm
+
+ARG TZ
+ARG PHP_EXTENSIONS
+ARG CONTAINER_PACKAGE_URL
+
+
+RUN if [ "${CONTAINER_PACKAGE_URL}" != "" ] ; then  \
+    sed -i "s|deb.debian.org|${CONTAINER_PACKAGE_URL}|g" /etc/apt/sources.list ; \
+fi
+
+
+RUN apt-get update \
+    && apt-get install -y tzdata \
+    && ln -fs /usr/share/zoneinfo/${TZ} /etc/localtime  \
+    && dpkg-reconfigure -f noninteractive tzdata
+
+
+# Clean up the package list to reduce image size
+RUN apt-get clean && rm -rf /var/lib/apt/lists/*
+
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+RUN install-php-extensions $PHP_EXTENSIONS
+
+
+# Install composer and change it's cache home
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+ENV COMPOSER_HOME=/tmp/composer
+
+
+WORKDIR /www
diff --git a/services/php82/php-fpm.conf b/services/php82/php-fpm.conf
diff --git a/services/php82/php.ini b/services/php82/php.ini

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,10 @@ server {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`server {`
`44`		`- listen 443 default ssl http2;`
`45`	`44`	`server_name localhost;`
	`45`	`+ listen 443 default ssl;`
	`46`	`+ http2 on;`
	`47`	`+`
`46`	`48`	`root /www/localhost;`
`47`	`49`	`index index.php index.html index.htm;`
`48`	`50`	`#charset koi8-r;`
`@@ -72,7 +74,7 @@ server {`
`72`	`74`	`# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000`
`73`	`75`	`#`
`74`	`76`	`location ~ [^/]\.php(/\|$) {`
`75`		`- fastcgi_pass php:9000;`
	`77`	`+ fastcgi_pass php82:9000;`
`76`	`78`	`include fastcgi-php.conf;`
`77`	`79`	`include fastcgi_params;`
`78`	`80`	`}`