28
									
								
								.env.example
									
									
									
									
									
								
							
							
						
						
									
										28
									
								
								.env.example
									
									
									
									
									
								
							@@ -38,13 +38,13 @@ COMPOSE_PROJECT_NAME=laradock
 | 
			
		||||
### PHP Version ###########################################
 | 
			
		||||
 | 
			
		||||
# Select a PHP version of the Workspace and PHP-FPM containers (Does not apply to HHVM).
 | 
			
		||||
# Accepted values: 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 | 
			
		||||
# Accepted values: 8.2 - 8.1 - 8.0 - 7.4 - 7.3 - 7.2 - 7.1 - 7.0 - 5.6
 | 
			
		||||
PHP_VERSION=7.4
 | 
			
		||||
 | 
			
		||||
### Phalcon Version ###########################################
 | 
			
		||||
 | 
			
		||||
# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 3.4.0+
 | 
			
		||||
PHALCON_VERSION=4.0.5
 | 
			
		||||
# Select a Phalcon version of the Workspace and PHP-FPM containers (Does not apply to HHVM). Accepted values: 5.0.0+
 | 
			
		||||
PHALCON_VERSION=5.0.0
 | 
			
		||||
 | 
			
		||||
### PHP Interpreter #######################################
 | 
			
		||||
 | 
			
		||||
@@ -65,6 +65,9 @@ PHP_IDE_CONFIG=serverName=laradock
 | 
			
		||||
 | 
			
		||||
PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
 | 
			
		||||
 | 
			
		||||
# Accepted values: 1.2 - 1.1 - 1.0
 | 
			
		||||
PHP_DOWNGRADE_OPENSSL_TLS_VERSION=1.2
 | 
			
		||||
 | 
			
		||||
### Windows Path ##########################################
 | 
			
		||||
 | 
			
		||||
# A fix for Windows users, to ensure the application path works
 | 
			
		||||
@@ -75,7 +78,10 @@ COMPOSE_CONVERT_WINDOWS_PATHS=1
 | 
			
		||||
# If you need to change the sources (i.e. to China), set CHANGE_SOURCE to true
 | 
			
		||||
CHANGE_SOURCE=false
 | 
			
		||||
# Set ORACLE INSTANT_CLIENT_MIRROR option if you want to use Intranet improve download, you can download files first
 | 
			
		||||
ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/
 | 
			
		||||
ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/the-paulus/oracle-instantclient/raw/master/
 | 
			
		||||
ORACLE_INSTANT_CLIENT_ARCH=x86_64
 | 
			
		||||
ORACLE_INSTANT_CLIENT_MAJOR=18
 | 
			
		||||
ORACLE_INSTANT_CLIENT_MINOR=3
 | 
			
		||||
 | 
			
		||||
### Docker Sync ###########################################
 | 
			
		||||
 | 
			
		||||
@@ -205,6 +211,9 @@ WORKSPACE_INSTALL_TRADER=false
 | 
			
		||||
WORKSPACE_PROTOC_VERSION=latest
 | 
			
		||||
WORKSPACE_INSTALL_MEMCACHED=true
 | 
			
		||||
WORKSPACE_INSTALL_EVENT=false
 | 
			
		||||
WORKSPACE_INSTALL_DNSUTILS=true
 | 
			
		||||
WORKSPACE_XDEBUG_PORT=9000
 | 
			
		||||
WORKSPACE_VITE_PORT=5173
 | 
			
		||||
 | 
			
		||||
### PHP_FPM ###############################################
 | 
			
		||||
 | 
			
		||||
@@ -276,8 +285,9 @@ PHP_FPM_AUDIOWAVEFORM=false
 | 
			
		||||
PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8"
 | 
			
		||||
PHP_FPM_INSTALL_DOCKER_CLIENT=false
 | 
			
		||||
PHP_FPM_DEFAULT_LOCALE=POSIX
 | 
			
		||||
PHP_FPM_XDEBUG_PORT=9003
 | 
			
		||||
PHP_FPM_XDEBUG_PORT=9000
 | 
			
		||||
PHP_FPM_INSTALL_EVENT=false
 | 
			
		||||
PHP_FPM_INSTALL_DNSUTILS=true
 | 
			
		||||
 | 
			
		||||
PHP_FPM_PUID=1000
 | 
			
		||||
PHP_FPM_PGID=1000
 | 
			
		||||
@@ -322,6 +332,7 @@ PHP_WORKER_INSTALL_IMAP=false
 | 
			
		||||
PHP_WORKER_INSTALL_XMLRPC=false
 | 
			
		||||
PHP_WORKER_INSTALL_SSDB=false
 | 
			
		||||
PHP_WORKER_INSTALL_EVENT=false
 | 
			
		||||
PHP_WORKER_INSTALL_INTL=true
 | 
			
		||||
 | 
			
		||||
PHP_WORKER_PUID=1000
 | 
			
		||||
PHP_WORKER_PGID=1000
 | 
			
		||||
@@ -378,6 +389,7 @@ APACHE_PHP_UPSTREAM_TIMEOUT=60
 | 
			
		||||
APACHE_DOCUMENT_ROOT=/var/www/
 | 
			
		||||
APACHE_SSL_PATH=./apache2/ssl/
 | 
			
		||||
APACHE_INSTALL_HTTP2=false
 | 
			
		||||
APACHE_FOR_MAC_M1=false
 | 
			
		||||
 | 
			
		||||
### MYSQL #################################################
 | 
			
		||||
 | 
			
		||||
@@ -895,7 +907,6 @@ MAILU_WEBMAIL=rainloop
 | 
			
		||||
# Dav server implementation (value: radicale, none)
 | 
			
		||||
MAILU_WEBDAV=radicale
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### TRAEFIK #################################################
 | 
			
		||||
 | 
			
		||||
TRAEFIK_HOST_HTTP_PORT=80
 | 
			
		||||
@@ -906,7 +917,6 @@ TRAEFIK_DASHBOARD_USER='admin:$2y$10$lXaL3lj6raFic6rFqr2.lOBoCudAIhB6zyoqObNg290
 | 
			
		||||
ACME_DOMAIN=example.org
 | 
			
		||||
ACME_EMAIL=email@example.org
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### MOSQUITTO #################################################
 | 
			
		||||
 | 
			
		||||
MOSQUITTO_PORT=9001
 | 
			
		||||
@@ -1050,3 +1060,7 @@ NATS_ROUTE_PORT=8222
 | 
			
		||||
### SOKETI ##################################################
 | 
			
		||||
SOKETI_PORT=6001
 | 
			
		||||
SOKETI_METRICS_SERVER_PORT=9601
 | 
			
		||||
 | 
			
		||||
### ONEDEV ##################################################
 | 
			
		||||
ONEDEV_HTTP_PORT=6610
 | 
			
		||||
ONEDEV_SSH_PORT=6611
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								.github/workflows/build-deploy-docs.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/build-deploy-docs.yml
									
									
									
									
										vendored
									
									
								
							@@ -8,8 +8,12 @@ on:
 | 
			
		||||
      - '.github/workflows/build-deploy-docs.yml'
 | 
			
		||||
      - 'DOCUMENTATION/**'
 | 
			
		||||
 | 
			
		||||
permissions: {}
 | 
			
		||||
jobs:
 | 
			
		||||
  build-deploy-docs:
 | 
			
		||||
    permissions:
 | 
			
		||||
      contents: write # to push pages branch (peaceiris/actions-gh-pages)
 | 
			
		||||
 | 
			
		||||
    if: github.repository == 'laradock/laradock'
 | 
			
		||||
    runs-on: ubuntu-20.04
 | 
			
		||||
    concurrency:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										5
									
								
								.github/workflows/main-ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										5
									
								
								.github/workflows/main-ci.yml
									
									
									
									
										vendored
									
									
								
							@@ -11,6 +11,9 @@ on:
 | 
			
		||||
  schedule:
 | 
			
		||||
    - cron: '0 0 * * 0'
 | 
			
		||||
 | 
			
		||||
permissions:
 | 
			
		||||
  contents: read # to fetch code (actions/checkout)
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  build-php:
 | 
			
		||||
    # Don't trigger on schedule event when in a fork
 | 
			
		||||
@@ -19,7 +22,7 @@ jobs:
 | 
			
		||||
    strategy:
 | 
			
		||||
      fail-fast: false
 | 
			
		||||
      matrix:
 | 
			
		||||
        php_version: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1" ]
 | 
			
		||||
        php_version: [ "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2" ]
 | 
			
		||||
        service: [ php-fpm, php-worker, workspace ]
 | 
			
		||||
    steps:
 | 
			
		||||
      - uses: actions/checkout@v2
 | 
			
		||||
 
 | 
			
		||||
@@ -2253,6 +2253,31 @@ For configuration information, visit the [bash-git-prompt repository](https://gi
 | 
			
		||||
<a name="Install-Oh-My-Zsh"></a>
 | 
			
		||||
## Install Oh My ZSH
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<br>
 | 
			
		||||
<a name="Install-Dnsutils"></a>
 | 
			
		||||
## Install Dnsutils
 | 
			
		||||
 | 
			
		||||
1 - First install `dnsutils` in the Workspace and the PHP-FPM Containers:
 | 
			
		||||
<br>
 | 
			
		||||
a) open the `.env` file
 | 
			
		||||
<br>
 | 
			
		||||
b) search for the `WORKSPACE_INSTALL_DNSUTILS` argument under the Workspace Container
 | 
			
		||||
<br>
 | 
			
		||||
c) set it to `true`
 | 
			
		||||
<br>
 | 
			
		||||
d) search for the `PHP_FPM_INSTALL_DNSUTILS` argument under the PHP-FPM Container
 | 
			
		||||
<br>
 | 
			
		||||
e) set it to `true`
 | 
			
		||||
<br>
 | 
			
		||||
 | 
			
		||||
2 - Re-build the containers `docker-compose build workspace php-fpm`
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
> With the Laravel autocomplete plugin.
 | 
			
		||||
 | 
			
		||||
[Zsh](https://en.wikipedia.org/wiki/Z_shell) is an extended Bourne shell with many improvements, including some features of Bash, ksh, and tcsh.
 | 
			
		||||
 
 | 
			
		||||
@@ -127,3 +127,21 @@ WORKSPACE_INSTALL_LIBPNG=true
 | 
			
		||||
docker-compose build workspace
 | 
			
		||||
```
 | 
			
		||||
 | 
			
		||||
## Apache2 container won't start on mac m1
 | 
			
		||||
 | 
			
		||||
To fix the problem you can follow those steps
 | 
			
		||||
 | 
			
		||||
1 - Open the `.env`.
 | 
			
		||||
 | 
			
		||||
2 - Search for `APACHE_FOR_MAC_M1` or add the key, if missing.
 | 
			
		||||
 | 
			
		||||
3 - Set the value to true:
 | 
			
		||||
 | 
			
		||||
```dotenv
 | 
			
		||||
APACHE_FOR_MAC_M1=true
 | 
			
		||||
```
 | 
			
		||||
4 - Finally rebuild the workspace image
 | 
			
		||||
 | 
			
		||||
```bash
 | 
			
		||||
docker-compose build apache2
 | 
			
		||||
```
 | 
			
		||||
 
 | 
			
		||||
@@ -180,6 +180,7 @@ That's it! enjoy :)
 | 
			
		||||
         - `SOAP` 
 | 
			
		||||
         - `Drush` 
 | 
			
		||||
         - `Wordpress CLI`
 | 
			
		||||
         - `dnsutils`
 | 
			
		||||
    - Apache ZooKeeper *(Centralized service for distributed systems to a hierarchical key-value store)*
 | 
			
		||||
    - Kibana *(Visualize your Elasticsearch data and navigate the Elastic Stack)*
 | 
			
		||||
    - Dejavu *(Edit your Elasticsearch data)*
 | 
			
		||||
@@ -389,8 +390,8 @@ Sponsoring is an act of giving in a different fashion. 🌱
 | 
			
		||||
<a href="https://onlinecasinohex.ca/online-casinos/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/CA.png"                   height="75px"    alt="Online casino list in Canada by OnlineCasinoHEX.ca"></a>
 | 
			
		||||
<a href="https://aussiecasinohex.com/online-pokies/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/AU.png"                   height="75px"    alt="Online pokies by AussieCasinoHEX.com"></a>
 | 
			
		||||
<a href="http://apiato.io/"                           target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/apiato.png"               height="75px"    alt="Apiato Build PHP API's faster"></a>
 | 
			
		||||
<a href="https://www.bestonlinecasino.com/"           target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/bestonlinecasino.jpg"     height="75px"    alt="We thank bestonlinecasino.com for their support"></a>
 | 
			
		||||
<a href="https://casinopilotti.com/"                  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/casinopilotti.png"        height="75px"    alt="CasinoPilotti"></a>
 | 
			
		||||
<!-- <a href="https://www.bestonlinecasino.com/"           target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/bestonlinecasino.jpg"     height="75px"    alt="We thank bestonlinecasino.com for their support"></a> -->
 | 
			
		||||
<!-- <a href="https://casinopilotti.com/"                  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/casinopilotti.png"        height="75px"    alt="CasinoPilotti"></a> -->
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<a href="https://opencollective.com/laradock/tiers/gold-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/0/avatar.svg?button=false&isActive=true" height="75px"></a>
 | 
			
		||||
@@ -417,7 +418,7 @@ Sponsoring is an act of giving in a different fashion. 🌱
 | 
			
		||||
 | 
			
		||||
<p align="center">
 | 
			
		||||
 | 
			
		||||
<a href="https://veepn.com/vpn-apps/vpn-for-chrome/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/VeePN.png"                height="65px"    alt="VeePN Chrome extension"></a>
 | 
			
		||||
<!-- <a href="https://veepn.com/vpn-apps/vpn-for-chrome/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/VeePN.png"                height="65px"    alt="VeePN Chrome extension"></a> -->
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<a href="https://opencollective.com/laradock/tiers/silver-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/0/avatar.svg?button=false&isActive=true" height="65px"></a>
 | 
			
		||||
 
 | 
			
		||||
@@ -196,8 +196,8 @@ Sponsoring is an act of giving in a different fashion. 🌱
 | 
			
		||||
<a href="https://onlinecasinohex.ca/online-casinos/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/CA.png"                   height="75px"    alt="Online casino list in Canada by OnlineCasinoHEX.ca"></a>
 | 
			
		||||
<a href="https://aussiecasinohex.com/online-pokies/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/AU.png"                   height="75px"    alt="Online pokies by AussieCasinoHEX.com"></a>
 | 
			
		||||
<a href="http://apiato.io/"                           target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/apiato.png"               height="75px"    alt="Apiato Build PHP API's faster"></a>
 | 
			
		||||
<a href="https://www.bestonlinecasino.com/"           target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/bestonlinecasino.jpg"     height="75px"    alt="We thank bestonlinecasino.com for their support"></a>
 | 
			
		||||
<a href="https://casinopilotti.com/"                  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/casinopilotti.png"        height="75px"    alt="CasinoPilotti"></a>
 | 
			
		||||
<!-- <a href="https://www.bestonlinecasino.com/"           target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/bestonlinecasino.jpg"     height="75px"    alt="We thank bestonlinecasino.com for their support"></a> -->
 | 
			
		||||
<!-- <a href="https://casinopilotti.com/"                  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/casinopilotti.png"        height="75px"    alt="CasinoPilotti"></a> -->
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<a href="https://opencollective.com/laradock/tiers/gold-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/gold-sponsors/0/avatar.svg?button=false&isActive=true" height="75px"></a>
 | 
			
		||||
@@ -224,7 +224,7 @@ Sponsoring is an act of giving in a different fashion. 🌱
 | 
			
		||||
 | 
			
		||||
<p align="center">
 | 
			
		||||
 | 
			
		||||
<a href="https://veepn.com/vpn-apps/vpn-for-chrome/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/VeePN.png"                height="65px"    alt="VeePN Chrome extension"></a>
 | 
			
		||||
<!-- <a href="https://veepn.com/vpn-apps/vpn-for-chrome/"  target="_blank"   style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/VeePN.png"                height="65px"    alt="VeePN Chrome extension"></a> -->
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<a href="https://opencollective.com/laradock/tiers/silver-sponsors/0/website" target="_blank"><img src="https://opencollective.com/laradock/tiers/silver-sponsors/0/avatar.svg?button=false&isActive=true" height="65px"></a>
 | 
			
		||||
 
 | 
			
		||||
@@ -30,3 +30,12 @@ ENTRYPOINT ["/opt/docker/bin/entrypoint.sh"]
 | 
			
		||||
CMD ["/bin/bash", "/opt/startup.sh"]
 | 
			
		||||
 | 
			
		||||
EXPOSE 80 443
 | 
			
		||||
 | 
			
		||||
ARG APACHE_FOR_MAC_M1=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${APACHE_FOR_MAC_M1} = true ]; then \
 | 
			
		||||
    # Change application source from deb.debian.org to aliyun source
 | 
			
		||||
    wget -O "/usr/local/bin/go-replace" "https://github.com/webdevops/goreplace/releases/download/1.1.2/gr-arm64-linux" && \
 | 
			
		||||
    chmod +x "/usr/local/bin/go-replace" && \
 | 
			
		||||
    "/usr/local/bin/go-replace" --version \
 | 
			
		||||
;fi
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM caddy/caddy:latest
 | 
			
		||||
FROM caddy:latest
 | 
			
		||||
 | 
			
		||||
COPY ./caddy/Caddyfile /etc/caddy/Caddyfile
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -74,6 +74,7 @@ services:
 | 
			
		||||
          - INSTALL_GMP=${WORKSPACE_INSTALL_GMP}
 | 
			
		||||
          - INSTALL_GNUPG=${WORKSPACE_INSTALL_GNUPG}
 | 
			
		||||
          - INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
 | 
			
		||||
          - XDEBUG_PORT=${WORKSPACE_XDEBUG_PORT}
 | 
			
		||||
          - INSTALL_PCOV=${WORKSPACE_INSTALL_PCOV}
 | 
			
		||||
          - INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
 | 
			
		||||
          - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
 | 
			
		||||
@@ -174,6 +175,7 @@ services:
 | 
			
		||||
          - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
 | 
			
		||||
          - INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED}
 | 
			
		||||
          - INSTALL_EVENT=${WORKSPACE_INSTALL_EVENT}
 | 
			
		||||
          - INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
 | 
			
		||||
          - http_proxy
 | 
			
		||||
          - https_proxy
 | 
			
		||||
          - no_proxy
 | 
			
		||||
@@ -190,6 +192,7 @@ services:
 | 
			
		||||
        - "${WORKSPACE_VUE_CLI_SERVE_HOST_PORT}:8080"
 | 
			
		||||
        - "${WORKSPACE_VUE_CLI_UI_HOST_PORT}:8000"
 | 
			
		||||
        - "${WORKSPACE_ANGULAR_CLI_SERVE_HOST_PORT}:4200"
 | 
			
		||||
        - "${WORKSPACE_VITE_PORT}:5173"
 | 
			
		||||
      tty: true
 | 
			
		||||
      environment:
 | 
			
		||||
        - PHP_IDE_CONFIG=${PHP_IDE_CONFIG}
 | 
			
		||||
@@ -218,6 +221,7 @@ services:
 | 
			
		||||
          - INSTALL_GMP=${PHP_FPM_INSTALL_GMP}
 | 
			
		||||
          - INSTALL_GNUPG=${PHP_FPM_INSTALL_GNUPG}
 | 
			
		||||
          - INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
 | 
			
		||||
          - XDEBUG_PORT=${PHP_FPM_XDEBUG_PORT}
 | 
			
		||||
          - INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV}
 | 
			
		||||
          - INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
 | 
			
		||||
          - INSTALL_BLACKFIRE=${INSTALL_BLACKFIRE}
 | 
			
		||||
@@ -279,6 +283,7 @@ services:
 | 
			
		||||
          - INSTALL_TRADER=${PHP_FPM_INSTALL_TRADER}
 | 
			
		||||
          - INSTALL_EVENT=${PHP_FPM_INSTALL_EVENT}
 | 
			
		||||
          - DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=${PHP_DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL}
 | 
			
		||||
          - DOWNGRADE_OPENSSL_TLS_VERSION=${PHP_DOWNGRADE_OPENSSL_TLS_VERSION}
 | 
			
		||||
          - PUID=${PHP_FPM_PUID}
 | 
			
		||||
          - PGID=${PHP_FPM_PGID}
 | 
			
		||||
          - IMAGEMAGICK_VERSION=${PHP_FPM_IMAGEMAGICK_VERSION}
 | 
			
		||||
@@ -287,6 +292,7 @@ services:
 | 
			
		||||
          - PHP_FPM_NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
 | 
			
		||||
          - PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
 | 
			
		||||
          - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
 | 
			
		||||
          - INSTALL_DNSUTILS=${PHP_FPM_INSTALL_DNSUTILS}
 | 
			
		||||
          - http_proxy
 | 
			
		||||
          - https_proxy
 | 
			
		||||
          - no_proxy
 | 
			
		||||
@@ -294,8 +300,6 @@ services:
 | 
			
		||||
        - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
 | 
			
		||||
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
 | 
			
		||||
        - docker-in-docker:/certs/client
 | 
			
		||||
      ports:
 | 
			
		||||
        - "${PHP_FPM_XDEBUG_PORT}:9003"
 | 
			
		||||
      expose:
 | 
			
		||||
        - "9000"
 | 
			
		||||
      extra_hosts:
 | 
			
		||||
@@ -352,6 +356,7 @@ services:
 | 
			
		||||
          - INSTALL_XMLRPC=${PHP_WORKER_INSTALL_XMLRPC}
 | 
			
		||||
          - INSTALL_SSDB=${PHP_WORKER_INSTALL_SSDB}
 | 
			
		||||
          - INSTALL_EVENT=${PHP_WORKER_INSTALL_EVENT}
 | 
			
		||||
          - INSTALL_INTL=${PHP_WORKER_INSTALL_INTL}
 | 
			
		||||
          - PUID=${PHP_WORKER_PUID}
 | 
			
		||||
          - PGID=${PHP_WORKER_PGID}
 | 
			
		||||
          - IMAGEMAGICK_VERSION=${PHP_WORKER_IMAGEMAGICK_VERSION}
 | 
			
		||||
@@ -485,6 +490,7 @@ services:
 | 
			
		||||
          - PHP_UPSTREAM_TIMEOUT=${APACHE_PHP_UPSTREAM_TIMEOUT}
 | 
			
		||||
          - DOCUMENT_ROOT=${APACHE_DOCUMENT_ROOT}
 | 
			
		||||
          - APACHE_INSTALL_HTTP2=${APACHE_INSTALL_HTTP2}
 | 
			
		||||
          - APACHE_FOR_MAC_M1=${APACHE_FOR_MAC_M1}
 | 
			
		||||
      volumes:
 | 
			
		||||
        - ${APP_CODE_PATH_HOST}:${APP_CODE_PATH_CONTAINER}${APP_CODE_CONTAINER_FLAG}
 | 
			
		||||
        - ${APACHE_HOST_LOG_PATH}:/var/log/apache2
 | 
			
		||||
@@ -1033,6 +1039,8 @@ services:
 | 
			
		||||
        - cluster.name=laradock-cluster
 | 
			
		||||
        - node.name=laradock-node
 | 
			
		||||
        - bootstrap.memory_lock=true
 | 
			
		||||
        - xpack.security.enabled=false
 | 
			
		||||
        - xpack.security.transport.ssl.enabled=false
 | 
			
		||||
        - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
 | 
			
		||||
        - cluster.initial_master_nodes=laradock-node
 | 
			
		||||
      ulimits:
 | 
			
		||||
@@ -2075,3 +2083,17 @@ services:
 | 
			
		||||
        - ${TARANTOOL_ADMIN_PORT}:80
 | 
			
		||||
      networks:
 | 
			
		||||
        - backend
 | 
			
		||||
 | 
			
		||||
  ### onedev ####################################################
 | 
			
		||||
    onedev:
 | 
			
		||||
      image: 1dev/server
 | 
			
		||||
      ports:
 | 
			
		||||
        - "${ONEDEV_HTTP_PORT}:6610"
 | 
			
		||||
        - "${ONEDEV_SSH_PORT}:6611"
 | 
			
		||||
      volumes:
 | 
			
		||||
        - ${DATA_PATH_HOST}/onedev:/opt/onedev
 | 
			
		||||
        - /var/run/docker.sock:/var/run/docker.sock
 | 
			
		||||
      networks:
 | 
			
		||||
        - frontend
 | 
			
		||||
        - backend
 | 
			
		||||
      restart: always
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM openjdk:8-jdk
 | 
			
		||||
FROM openjdk:11-jdk
 | 
			
		||||
 | 
			
		||||
RUN apt-get update && apt-get install -y git curl && rm -rf /var/lib/apt/lists/*
 | 
			
		||||
 | 
			
		||||
@@ -36,11 +36,11 @@ COPY init.groovy /usr/share/jenkins/ref/init.groovy.d/tcp-slave-agent-port.groov
 | 
			
		||||
 | 
			
		||||
# jenkins version being bundled in this docker image
 | 
			
		||||
ARG JENKINS_VERSION
 | 
			
		||||
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.303.2}
 | 
			
		||||
ENV JENKINS_VERSION ${JENKINS_VERSION:-2.381}
 | 
			
		||||
 | 
			
		||||
# jenkins.war checksum, download will be validated using it
 | 
			
		||||
# 2.303.2
 | 
			
		||||
ARG JENKINS_SHA=c4b8532e25a33001a3d8883d3cd87a664953ace239b486839b683065817d29cf
 | 
			
		||||
ARG JENKINS_SHA=62ca5dcecbf176452d94d4438488662e223ab9594dccb564f065c63832a47302
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Can be used to customize where jenkins.war get downloaded from
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,5 @@
 | 
			
		||||
FROM djfarrelly/maildev
 | 
			
		||||
FROM maildev/maildev
 | 
			
		||||
 | 
			
		||||
LABEL maintainer="Maxime Hélias <maximehelias16@gmail.com>"
 | 
			
		||||
LABEL maintainer="Dan Farrelly"
 | 
			
		||||
 | 
			
		||||
EXPOSE 80 25
 | 
			
		||||
 
 | 
			
		||||
@@ -212,12 +212,17 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_XDEBUG=false
 | 
			
		||||
ARG XDEBUG_PORT=9003
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 | 
			
		||||
  # Install the xdebug extension
 | 
			
		||||
  # https://xdebug.org/docs/compat
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
 | 
			
		||||
    pecl install xdebug-3.1.2; \
 | 
			
		||||
    if [ ${LARADOCK_PHP_VERSION} = "8.2" ]; then \
 | 
			
		||||
      pecl install xdebug-3.2.0; \
 | 
			
		||||
    else \
 | 
			
		||||
      pecl install xdebug-3.1.4; \
 | 
			
		||||
    fi; \
 | 
			
		||||
  else \
 | 
			
		||||
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
 | 
			
		||||
      pecl install xdebug-2.5.5; \
 | 
			
		||||
@@ -235,10 +240,10 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 | 
			
		||||
# Copy xdebug configuration for remote debugging
 | 
			
		||||
COPY ./xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini
 | 
			
		||||
 | 
			
		||||
RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
 | 
			
		||||
RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
 | 
			
		||||
  sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=9003/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /usr/local/etc/php/conf.d/xdebug.ini && \
 | 
			
		||||
@@ -259,12 +264,10 @@ USER root
 | 
			
		||||
ARG INSTALL_PCOV=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_PCOV} = true ]; then \
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]  || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \
 | 
			
		||||
    pecl install pcov && \
 | 
			
		||||
    docker-php-ext-enable pcov \
 | 
			
		||||
  ;fi \
 | 
			
		||||
  ;fi \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
@@ -323,6 +326,8 @@ RUN set -eux; \
 | 
			
		||||
        pecl install swoole-4.3.5; \
 | 
			
		||||
      elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
 | 
			
		||||
        pecl install swoole-4.5.11; \
 | 
			
		||||
      elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
        pecl install swoole-4.8.12; \
 | 
			
		||||
      else \
 | 
			
		||||
        pecl install swoole; \
 | 
			
		||||
      fi; \
 | 
			
		||||
@@ -594,13 +599,17 @@ RUN set -xe; \
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_OCI8=false
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/the-paulus/oracle-instantclient/raw/master/
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_ARCH=x86_64
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MAJOR=18
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MINOR=3
 | 
			
		||||
 | 
			
		||||
ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
 | 
			
		||||
ENV OCI_HOME="/opt/oracle/instantclient_12_1"
 | 
			
		||||
ENV OCI_LIB_DIR="/opt/oracle/instantclient_12_1"
 | 
			
		||||
ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_12_1/sdk/include"
 | 
			
		||||
ENV OCI_VERSION=12
 | 
			
		||||
ENV ORACLE_INSTANT_CLIENT_VERSION=${ORACLE_INSTANT_CLIENT_MAJOR}_${ORACLE_INSTANT_CLIENT_MINOR}
 | 
			
		||||
ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}"
 | 
			
		||||
ENV OCI_HOME="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}"
 | 
			
		||||
ENV OCI_LIB_DIR="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}"
 | 
			
		||||
ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/sdk/include"
 | 
			
		||||
ENV OCI_VERSION=${ORACLE_INSTANT_CLIENT_MAJOR}
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_OCI8} = true ]; then \
 | 
			
		||||
    # Install wget
 | 
			
		||||
@@ -608,13 +617,13 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
 | 
			
		||||
    # Install Oracle Instantclient
 | 
			
		||||
    && mkdir /opt/oracle \
 | 
			
		||||
        && cd /opt/oracle \
 | 
			
		||||
        && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.x64-12.1.0.2.0.zip \
 | 
			
		||||
        && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.x64-12.1.0.2.0.zip \
 | 
			
		||||
        && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
 | 
			
		||||
        && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
 | 
			
		||||
        && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \
 | 
			
		||||
        && ln -s /opt/oracle/instantclient_12_1/libclntshcore.so.12.1 /opt/oracle/instantclient_12_1/libclntshcore.so \
 | 
			
		||||
        && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
 | 
			
		||||
        && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip \
 | 
			
		||||
      && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip \
 | 
			
		||||
      && unzip /opt/oracle/instantclient-basic-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip -d /opt/oracle \
 | 
			
		||||
      && unzip /opt/oracle/instantclient-sdk-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip -d /opt/oracle \
 | 
			
		||||
      && if [ ${OCI_VERSION} -lt 18 ] ; then ln -s /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntsh.so.${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntsh.so ; fi\
 | 
			
		||||
      && if [ ${OCI_VERSION} -lt 18 ] ; then ln -s /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntshcore.so.${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntshcore.so ; fi \
 | 
			
		||||
      && if [ ${OCI_VERSION} -lt 18 ] ; then ln -s /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libocci.so.${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libocci.so ; fi \
 | 
			
		||||
        && rm -rf /opt/oracle/*.zip \
 | 
			
		||||
    # Install PHP extensions deps
 | 
			
		||||
    && apt-get install --no-install-recommends -yqq \
 | 
			
		||||
@@ -622,15 +631,15 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
 | 
			
		||||
      freetds-dev && \
 | 
			
		||||
    # Install PHP extensions
 | 
			
		||||
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
 | 
			
		||||
      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \
 | 
			
		||||
      echo 'instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/' | pecl install oci8-2.0.12; \
 | 
			
		||||
    elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \
 | 
			
		||||
      echo 'instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/' | pecl install oci8-2.2.0; \
 | 
			
		||||
    elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "0" ]; then \
 | 
			
		||||
      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-3.0.1; \
 | 
			
		||||
      echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.0.1; \
 | 
			
		||||
    else \
 | 
			
		||||
      echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \
 | 
			
		||||
      echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \
 | 
			
		||||
    fi \
 | 
			
		||||
        && docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/opt/oracle/instantclient_12_1,12.1 \
 | 
			
		||||
    && docker-php-ext-configure pdo_oci --with-pdo-oci=instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION},${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} \
 | 
			
		||||
        && docker-php-ext-configure pdo_dblib --with-libdir=/lib/x86_64-linux-gnu \
 | 
			
		||||
        && docker-php-ext-install \
 | 
			
		||||
                pdo_oci \
 | 
			
		||||
@@ -715,7 +724,8 @@ ARG INSTALL_LDAP=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_LDAP} = true ]; then \
 | 
			
		||||
    apt-get install -yqq libldap2-dev && \
 | 
			
		||||
    docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
 | 
			
		||||
    ARCH=$(arch)   && \
 | 
			
		||||
    docker-php-ext-configure ldap --with-libdir="lib/${ARCH}-linux-gnu/" && \
 | 
			
		||||
    docker-php-ext-install ldap \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
@@ -737,8 +747,9 @@ RUN set -eux; \
 | 
			
		||||
      ###########################################################################
 | 
			
		||||
      # Ref from https://github.com/Microsoft/msphpsql/wiki/Dockerfile-for-adding-pdo_sqlsrv-and-sqlsrv-to-official-php-image
 | 
			
		||||
      ###########################################################################
 | 
			
		||||
      # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux
 | 
			
		||||
      apt-get install -yqq apt-transport-https gnupg lsb-release \
 | 
			
		||||
      # Add Microsoft repo for Microsoft ODBC Driver 13 for Linux \
 | 
			
		||||
      apt-get update \
 | 
			
		||||
      && apt-get install -yqq apt-transport-https gnupg lsb-release \
 | 
			
		||||
      && curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add - \
 | 
			
		||||
      && curl https://packages.microsoft.com/config/debian/$(lsb_release -rs)/prod.list > /etc/apt/sources.list.d/mssql-release.list \
 | 
			
		||||
      && apt-get update -yqq \
 | 
			
		||||
@@ -850,25 +861,13 @@ ARG INSTALL_PHALCON=false
 | 
			
		||||
ARG LARADOCK_PHALCON_VERSION
 | 
			
		||||
ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 | 
			
		||||
 | 
			
		||||
# Copy phalcon configration
 | 
			
		||||
COPY ./phalcon.ini /usr/local/etc/php/conf.d/phalcon.ini.disable
 | 
			
		||||
 | 
			
		||||
RUN if [ $INSTALL_PHALCON = true ]; then \
 | 
			
		||||
    apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
 | 
			
		||||
    && git clone https://github.com/jbboehr/php-psr.git \
 | 
			
		||||
    && cd php-psr \
 | 
			
		||||
    && phpize \
 | 
			
		||||
    && ./configure \
 | 
			
		||||
    && make \
 | 
			
		||||
    && make test \
 | 
			
		||||
    && make install \
 | 
			
		||||
    && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${LARADOCK_PHALCON_VERSION}.zip \
 | 
			
		||||
    && unzip -d /tmp/ /tmp/cphalcon.zip \
 | 
			
		||||
    && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
 | 
			
		||||
    && ./install \
 | 
			
		||||
    && mv /usr/local/etc/php/conf.d/phalcon.ini.disable /usr/local/etc/php/conf.d/phalcon.ini \
 | 
			
		||||
    && rm -rf /tmp/cphalcon* \
 | 
			
		||||
;fi
 | 
			
		||||
      apt-get update -yqq \
 | 
			
		||||
      && pecl channel-update pecl.php.net \
 | 
			
		||||
      && apt-get install -yqq libpcre3-dev; \
 | 
			
		||||
      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
 | 
			
		||||
      docker-php-ext-enable phalcon \
 | 
			
		||||
  ;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
# APCU:
 | 
			
		||||
@@ -1210,9 +1209,10 @@ RUN set -xe; \
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
ARG DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL=false
 | 
			
		||||
ARG DOWNGRADE_OPENSSL_TLS_VERSION=1.2
 | 
			
		||||
 | 
			
		||||
RUN if [ ${DOWNGRADE_OPENSSL_TLS_AND_SECLEVEL} = true ]; then \
 | 
			
		||||
    sed -i 's,^\(MinProtocol[ ]*=\).*,\1'TLSv1.2',g' /etc/ssl/openssl.cnf \
 | 
			
		||||
    sed -i 's,^\(MinProtocol[ ]*=\).*,\1'TLSv${DOWNGRADE_OPENSSL_TLS_VERSION}',g' /etc/ssl/openssl.cnf \
 | 
			
		||||
    && \
 | 
			
		||||
    sed -i 's,^\(CipherString[ ]*=\).*,\1'DEFAULT@SECLEVEL=1',g' /etc/ssl/openssl.cnf\
 | 
			
		||||
;fi
 | 
			
		||||
@@ -1270,11 +1270,23 @@ RUN set -eux; \
 | 
			
		||||
      php -m  | grep -q 'event' \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
# DNS utilities:
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
USER root
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_DNSUTILS=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
 | 
			
		||||
    apt-get update && apt-get install -y dnsutils \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
# Check PHP version:
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
RUN set -xe; php -v | head -n 1 | grep -q "PHP ${LARADOCK_PHP_VERSION}."
 | 
			
		||||
RUN set -xe; php -v | grep -q "PHP ${LARADOCK_PHP_VERSION}."
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
#--------------------------------------------------------------------------
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1955
									
								
								php-fpm/php8.2.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1955
									
								
								php-fpm/php8.2.ini
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -32,15 +32,20 @@ RUN apk --update add wget \
 | 
			
		||||
  cyrus-sasl-dev \
 | 
			
		||||
  libgsasl-dev \
 | 
			
		||||
  oniguruma-dev \
 | 
			
		||||
  libressl \
 | 
			
		||||
  libressl-dev \
 | 
			
		||||
  supervisor
 | 
			
		||||
  supervisor; \
 | 
			
		||||
  if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "50600" ] || \
 | 
			
		||||
     [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70000" ]; then \
 | 
			
		||||
    apk --update add libressl libressl-dev; \
 | 
			
		||||
  else \
 | 
			
		||||
    apk --update add openssl-dev; \
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
RUN pecl channel-update pecl.php.net; \
 | 
			
		||||
  docker-php-ext-install mysqli mbstring pdo pdo_mysql xml pcntl; \
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
 | 
			
		||||
    php -m | grep -q 'tokenizer'; \
 | 
			
		||||
  if [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80100" ] || \
 | 
			
		||||
     [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80200" ]; then \
 | 
			
		||||
    php -m | grep -oiE '^tokenizer$'; \
 | 
			
		||||
  else \
 | 
			
		||||
    docker-php-ext-install tokenizer; \
 | 
			
		||||
  fi
 | 
			
		||||
@@ -310,23 +315,16 @@ RUN if [ ${INSTALL_CASSANDRA} = true ]; then \
 | 
			
		||||
 | 
			
		||||
# Install Phalcon ext
 | 
			
		||||
ARG INSTALL_PHALCON=false
 | 
			
		||||
ARG PHALCON_VERSION
 | 
			
		||||
ENV PHALCON_VERSION ${PHALCON_VERSION}
 | 
			
		||||
ARG LARADOCK_PHALCON_VERSION
 | 
			
		||||
ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 | 
			
		||||
 | 
			
		||||
RUN if [ $INSTALL_PHALCON = true ]; then \
 | 
			
		||||
  apk --update add unzip gcc make re2c bash\
 | 
			
		||||
  && git clone https://github.com/jbboehr/php-psr.git \
 | 
			
		||||
  && cd php-psr \
 | 
			
		||||
  && phpize \
 | 
			
		||||
  && ./configure \
 | 
			
		||||
  && make \
 | 
			
		||||
  && make test \
 | 
			
		||||
  && make install \
 | 
			
		||||
  && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${PHALCON_VERSION}.zip \
 | 
			
		||||
  && unzip -d /tmp/ /tmp/cphalcon.zip \
 | 
			
		||||
  && cd /tmp/cphalcon-${PHALCON_VERSION}/build \
 | 
			
		||||
  && ./install \
 | 
			
		||||
  && rm -rf /tmp/cphalcon* \
 | 
			
		||||
      apt-get update -yqq \
 | 
			
		||||
      && pecl channel-update pecl.php.net \
 | 
			
		||||
      && apt-get install -yqq libpcre3-dev; \
 | 
			
		||||
      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
 | 
			
		||||
      docker-php-ext-enable phalcon; \
 | 
			
		||||
      php -m | grep -q 'phalcon' \
 | 
			
		||||
    ;fi
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_GHOSTSCRIPT=false
 | 
			
		||||
@@ -362,6 +360,8 @@ RUN set -eux; \
 | 
			
		||||
      pecl install swoole-4.3.5; \
 | 
			
		||||
    elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "70100" ]; then \
 | 
			
		||||
      pecl install swoole-4.5.11; \
 | 
			
		||||
    elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
      pecl install swoole-4.8.12; \
 | 
			
		||||
    else \
 | 
			
		||||
      pecl install swoole; \
 | 
			
		||||
    fi; \
 | 
			
		||||
@@ -508,6 +508,18 @@ RUN set -xe; \
 | 
			
		||||
  && docker-php-ext-enable ssdb \
 | 
			
		||||
  ;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
# Intl:
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_INTL=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_INTL} = true ]; then \
 | 
			
		||||
    apk add icu-dev && \
 | 
			
		||||
    docker-php-ext-configure intl && \
 | 
			
		||||
    docker-php-ext-install intl && \
 | 
			
		||||
    docker-php-ext-enable intl \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
############################################################################
 | 
			
		||||
## Event:
 | 
			
		||||
@@ -536,7 +548,7 @@ RUN set -eux; \
 | 
			
		||||
      make &&\
 | 
			
		||||
      make install &&\
 | 
			
		||||
      rm /tmp/event.tar.gz &&\
 | 
			
		||||
      docker-php-ext-enable event &&\
 | 
			
		||||
      docker-php-ext-enable --ini-name zz-event.ini event &&\
 | 
			
		||||
      php -m  | grep -q 'event' \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										19116
									
								
								react/package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										19116
									
								
								react/package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -20,7 +20,7 @@
 | 
			
		||||
    "react-intl": "^4.7.6",
 | 
			
		||||
    "react-redux": "^7.2.2",
 | 
			
		||||
    "react-router-dom": "^5.2.0",
 | 
			
		||||
    "react-scripts": "3.4.1",
 | 
			
		||||
    "react-scripts": "5.0.1",
 | 
			
		||||
    "redux": "^4.0.5",
 | 
			
		||||
    "redux-saga": "^1.1.3"
 | 
			
		||||
  },
 | 
			
		||||
 
 | 
			
		||||
@@ -327,13 +327,18 @@ RUN set -eux; \
 | 
			
		||||
USER root
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_XDEBUG=false
 | 
			
		||||
ARG XDEBUG_PORT=9003
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 | 
			
		||||
  # Install the xdebug extension
 | 
			
		||||
  # https://xdebug.org/docs/compat
 | 
			
		||||
  apt-get install -yqq pkg-config php-xml php${LARADOCK_PHP_VERSION}-xml && \
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
 | 
			
		||||
    pecl install xdebug-3.1.2; \
 | 
			
		||||
    if [ ${LARADOCK_PHP_VERSION} = "8.2" ]; then \
 | 
			
		||||
      pecl install xdebug-3.2.0; \
 | 
			
		||||
    else \
 | 
			
		||||
      pecl install xdebug-3.1.4; \
 | 
			
		||||
    fi; \
 | 
			
		||||
  else \
 | 
			
		||||
    if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
 | 
			
		||||
      pecl install xdebug-2.5.5; \
 | 
			
		||||
@@ -351,10 +356,10 @@ RUN if [ ${INSTALL_XDEBUG} = true ]; then \
 | 
			
		||||
# ADD for REMOTE debugging
 | 
			
		||||
COPY ./xdebug.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini
 | 
			
		||||
 | 
			
		||||
RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]; then \
 | 
			
		||||
RUN if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ] || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && { [ $(php -r "echo PHP_MINOR_VERSION;") = "4" ] || [ $(php -r "echo PHP_MINOR_VERSION;") = "3" ] ;} ;}; then \
 | 
			
		||||
  sed -i "s/xdebug.remote_host=/xdebug.client_host=/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_connect_back=0/xdebug.discover_client_host=false/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=9003/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_port=9000/xdebug.client_port=${XDEBUG_PORT}/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.profiler_enable=0/; xdebug.profiler_enable=0/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.profiler_output_dir=/xdebug.output_dir=/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
  sed -i "s/xdebug.remote_mode=req/; xdebug.remote_mode=req/" /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/xdebug.ini && \
 | 
			
		||||
@@ -375,13 +380,11 @@ USER root
 | 
			
		||||
ARG INSTALL_PCOV=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_PCOV} = true ]; then \
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
    if [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; then \
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "8" ]  || { [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") != "0" ]; }; then \
 | 
			
		||||
    pecl install pcov && \
 | 
			
		||||
    echo "extension=pcov.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini && \
 | 
			
		||||
    echo "pcov.enabled" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
 | 
			
		||||
  ;fi \
 | 
			
		||||
  ;fi \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@@ -533,7 +536,8 @@ RUN if [ ${INSTALL_GEARMAN} = true ]; then \
 | 
			
		||||
ARG INSTALL_PHPREDIS=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
 | 
			
		||||
    apt-get install -yqq php${LARADOCK_PHP_VERSION}-redis \
 | 
			
		||||
    apt-get update \
 | 
			
		||||
    && apt-get install -yqq php${LARADOCK_PHP_VERSION}-redis \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
@@ -551,6 +555,8 @@ RUN set -eux; \
 | 
			
		||||
        echo '' | pecl -q install swoole-4.3.5; \
 | 
			
		||||
      elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ] && [ $(php -r "echo PHP_MINOR_VERSION;") = "1" ]; then \
 | 
			
		||||
        echo '' | pecl -q install swoole-4.5.11; \
 | 
			
		||||
      elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
        echo '' | pecl -q install swoole-4.8.12; \
 | 
			
		||||
      else \
 | 
			
		||||
        echo '' | pecl -q install swoole; \
 | 
			
		||||
      fi; \
 | 
			
		||||
@@ -730,7 +736,7 @@ ENV NVM_NODEJS_ORG_MIRROR ${NVM_NODEJS_ORG_MIRROR}
 | 
			
		||||
RUN if [ ${INSTALL_NODE} = true ]; then \
 | 
			
		||||
    # Install nvm (A Node Version Manager)
 | 
			
		||||
    mkdir -p $NVM_DIR && \
 | 
			
		||||
    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh | bash \
 | 
			
		||||
    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.2/install.sh | bash \
 | 
			
		||||
        && . $NVM_DIR/nvm.sh \
 | 
			
		||||
        && nvm install ${NODE_VERSION} \
 | 
			
		||||
        && nvm use ${NODE_VERSION} \
 | 
			
		||||
@@ -754,7 +760,6 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
 | 
			
		||||
        && if [ ${INSTALL_NPM_ANGULAR_CLI} = true ]; then \
 | 
			
		||||
        npm install -g @angular/cli \
 | 
			
		||||
        ;fi \
 | 
			
		||||
        && ln -s `npm bin --global` /home/laradock/.node-bin \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
# Wouldn't execute when added to the RUN statement in the above block
 | 
			
		||||
@@ -774,9 +779,6 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
 | 
			
		||||
    echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> ~/.bashrc \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
# Add PATH for node
 | 
			
		||||
ENV PATH $PATH:/home/laradock/.node-bin
 | 
			
		||||
 | 
			
		||||
# Make it so the node modules can be executed with 'docker-compose exec'
 | 
			
		||||
# We'll create symbolic links into '/usr/local/bin'.
 | 
			
		||||
RUN if [ ${INSTALL_NODE} = true ]; then \
 | 
			
		||||
@@ -903,13 +905,17 @@ RUN set -xe; \
 | 
			
		||||
 | 
			
		||||
USER root
 | 
			
		||||
ARG INSTALL_OCI8=false
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/diogomascarenha/oracle-instantclient/raw/master/
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MIRROR=https://github.com/the-paulus/oracle-instantclient/raw/master/
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_ARCH=x86_64
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MAJOR=18
 | 
			
		||||
ARG ORACLE_INSTANT_CLIENT_MINOR=3
 | 
			
		||||
 | 
			
		||||
ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_12_1"
 | 
			
		||||
ENV OCI_HOME="/opt/oracle/instantclient_12_1"
 | 
			
		||||
ENV OCI_LIB_DIR="/opt/oracle/instantclient_12_1"
 | 
			
		||||
ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_12_1/sdk/include"
 | 
			
		||||
ENV OCI_VERSION=12
 | 
			
		||||
ENV ORACLE_INSTANT_CLIENT_VERSION=${ORACLE_INSTANT_CLIENT_MAJOR}_${ORACLE_INSTANT_CLIENT_MINOR}
 | 
			
		||||
ENV LD_LIBRARY_PATH="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}"
 | 
			
		||||
ENV OCI_HOME="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}"
 | 
			
		||||
ENV OCI_LIB_DIR="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}"
 | 
			
		||||
ENV OCI_INCLUDE_DIR="/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/sdk/include"
 | 
			
		||||
ENV OCI_VERSION=${ORACLE_INSTANT_CLIENT_MAJOR}
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_OCI8} = true ]; then \
 | 
			
		||||
  # Install wget
 | 
			
		||||
@@ -917,13 +923,13 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
 | 
			
		||||
  # Install Oracle Instantclient
 | 
			
		||||
  && mkdir /opt/oracle \
 | 
			
		||||
      && cd /opt/oracle \
 | 
			
		||||
      && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.x64-12.1.0.2.0.zip \
 | 
			
		||||
      && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.x64-12.1.0.2.0.zip \
 | 
			
		||||
      && unzip /opt/oracle/instantclient-basic-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
 | 
			
		||||
      && unzip /opt/oracle/instantclient-sdk-linux.x64-12.1.0.2.0.zip -d /opt/oracle \
 | 
			
		||||
      && ln -s /opt/oracle/instantclient_12_1/libclntsh.so.12.1 /opt/oracle/instantclient_12_1/libclntsh.so \
 | 
			
		||||
      && ln -s /opt/oracle/instantclient_12_1/libclntshcore.so.12.1 /opt/oracle/instantclient_12_1/libclntshcore.so \
 | 
			
		||||
      && ln -s /opt/oracle/instantclient_12_1/libocci.so.12.1 /opt/oracle/instantclient_12_1/libocci.so \
 | 
			
		||||
      && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-basic-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip \
 | 
			
		||||
      && wget ${ORACLE_INSTANT_CLIENT_MIRROR}instantclient-sdk-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip \
 | 
			
		||||
      && unzip /opt/oracle/instantclient-basic-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip -d /opt/oracle \
 | 
			
		||||
      && unzip /opt/oracle/instantclient-sdk-linux.${ORACLE_INSTANT_CLIENT_ARCH}-${ORACLE_INSTANT_CLIENT_VERSION}.zip -d /opt/oracle \
 | 
			
		||||
      && if [ ${OCI_VERSION} -lt 18 ] ; then ln -s /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntsh.so.${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntsh.so ; fi\
 | 
			
		||||
      && if [ ${OCI_VERSION} -lt 18 ] ; then ln -s /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntshcore.so.${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libclntshcore.so ; fi \
 | 
			
		||||
      && if [ ${OCI_VERSION} -lt 18 ] ; then ln -s /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libocci.so.${ORACLE_INSTANT_CLIENT_MAJOR}.${ORACLE_INSTANT_CLIENT_MINOR} /opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/libocci.so ; fi \
 | 
			
		||||
      && rm -rf /opt/oracle/*.zip \
 | 
			
		||||
  # Install PHP extensions deps
 | 
			
		||||
  && apt-get update \
 | 
			
		||||
@@ -931,13 +937,13 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
 | 
			
		||||
          libaio-dev && \
 | 
			
		||||
  # Install PHP extensions
 | 
			
		||||
  if [ $(php -r "echo PHP_MAJOR_VERSION;") = "5" ]; then \
 | 
			
		||||
    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.0.12; \
 | 
			
		||||
  echo 'instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/' | pecl install oci8-2.0.12; \
 | 
			
		||||
  elif [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
 | 
			
		||||
    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-2.2.0; \
 | 
			
		||||
  echo 'instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/' | pecl install oci8-2.2.0; \
 | 
			
		||||
  elif [ $(php -r "echo PHP_VERSION_ID - PHP_RELEASE_VERSION;") = "80000" ]; then \
 | 
			
		||||
    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8-3.0.1; \
 | 
			
		||||
    echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.0.1; \
 | 
			
		||||
  else \
 | 
			
		||||
    echo 'instantclient,/opt/oracle/instantclient_12_1/' | pecl install oci8; \
 | 
			
		||||
    echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \
 | 
			
		||||
  fi \
 | 
			
		||||
  && echo "extension=oci8.so" >> /etc/php/${LARADOCK_PHP_VERSION}/cli/php.ini \
 | 
			
		||||
  && php -m | grep -q 'oci8' \
 | 
			
		||||
@@ -975,6 +981,7 @@ ARG INSTALL_LARAVEL_ENVOY=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_LARAVEL_ENVOY} = true ]; then \
 | 
			
		||||
    # Install the Laravel Envoy
 | 
			
		||||
    composer global config --no-plugins allow-plugins.kylekatarnls/update-helper true && \
 | 
			
		||||
    composer global require laravel/envoy \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
@@ -1144,7 +1151,7 @@ RUN if [ ${INSTALL_SYMFONY} = true ]; then \
 | 
			
		||||
  mkdir -p /usr/local/bin \
 | 
			
		||||
  && apt-get -y install sudo wget \
 | 
			
		||||
  && wget --quiet https://get.symfony.com/cli/installer -O - | bash \
 | 
			
		||||
  && mv /root/.symfony/bin/symfony /usr/local/bin/symfony \
 | 
			
		||||
  && mv /root/.symfony5/bin/symfony /usr/local/bin/symfony \
 | 
			
		||||
  && chmod a+x /usr/local/bin/symfony \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
@@ -1322,23 +1329,14 @@ ARG LARADOCK_PHALCON_VERSION
 | 
			
		||||
ENV LARADOCK_PHALCON_VERSION ${LARADOCK_PHALCON_VERSION}
 | 
			
		||||
 | 
			
		||||
RUN if [ $INSTALL_PHALCON = true ]; then \
 | 
			
		||||
    apt-get update && apt-get install -yqq unzip libpcre3-dev gcc make re2c git automake autoconf\
 | 
			
		||||
    && git clone https://github.com/jbboehr/php-psr.git \
 | 
			
		||||
    && cd php-psr \
 | 
			
		||||
    && phpize \
 | 
			
		||||
    && ./configure \
 | 
			
		||||
    && make \
 | 
			
		||||
    && make test \
 | 
			
		||||
    && make install \
 | 
			
		||||
    && curl -L -o /tmp/cphalcon.zip https://github.com/phalcon/cphalcon/archive/v${LARADOCK_PHALCON_VERSION}.zip \
 | 
			
		||||
    && unzip -d /tmp/ /tmp/cphalcon.zip \
 | 
			
		||||
    && cd /tmp/cphalcon-${LARADOCK_PHALCON_VERSION}/build \
 | 
			
		||||
    && ./install \
 | 
			
		||||
    && echo "extension=psr.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
 | 
			
		||||
    && echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini \
 | 
			
		||||
    && ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-phalcon.ini \
 | 
			
		||||
    && rm -rf /tmp/cphalcon* \
 | 
			
		||||
;fi
 | 
			
		||||
      apt-get update -yqq \
 | 
			
		||||
      && pecl channel-update pecl.php.net \
 | 
			
		||||
      && apt-get install -yqq libpcre3-dev; \
 | 
			
		||||
      pecl install phalcon-${LARADOCK_PHALCON_VERSION}; \
 | 
			
		||||
      echo "extension=phalcon.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini; \
 | 
			
		||||
      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/phalcon.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/50-phalcon.ini; \
 | 
			
		||||
      php -m | grep -q 'phalcon' \
 | 
			
		||||
  ;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
USER root
 | 
			
		||||
@@ -1529,6 +1527,7 @@ ARG INSTALL_PROTOC=false
 | 
			
		||||
ARG PROTOC_VERSION
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_PROTOC} = true ]; then \
 | 
			
		||||
  apt-get -yqq install sudo wget unzip && \
 | 
			
		||||
  if [ ${PROTOC_VERSION} = "latest" ]; then \
 | 
			
		||||
    REAL_PROTOC_VERSION=$(curl -s https://api.github.com/repos/protocolbuffers/protobuf/releases/latest | \
 | 
			
		||||
      sed -nr 's/.*"tag_name":\s?"v(.+?)".*/\1/p'); \
 | 
			
		||||
@@ -1536,10 +1535,10 @@ RUN if [ ${INSTALL_PROTOC} = true ]; then \
 | 
			
		||||
    REAL_PROTOC_VERSION=${PROTOC_VERSION}; \
 | 
			
		||||
  fi && \
 | 
			
		||||
  PROTOC_ZIP=protoc-${REAL_PROTOC_VERSION}-linux-x86_64.zip; \
 | 
			
		||||
  curl -L -o /tmp/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v${REAL_PROTOC_VERSION}/${PROTOC_ZIP} && \
 | 
			
		||||
  unzip -q -o /tmp/protoc.zip -d /usr/local bin/protoc && \
 | 
			
		||||
  unzip -q -o /tmp/protoc.zip -d /usr/local 'include/*' && \
 | 
			
		||||
  rm -f /tmp/protoc.zip && \
 | 
			
		||||
  wget https://github.com/protocolbuffers/protobuf/releases/download/v${REAL_PROTOC_VERSION}/${PROTOC_ZIP} && \
 | 
			
		||||
  unzip -q -o ${PROTOC_ZIP} -d /usr/local bin/protoc && \
 | 
			
		||||
  unzip -q -o ${PROTOC_ZIP} -d /usr/local 'include/*' && \
 | 
			
		||||
  rm -f ${PROTOC_ZIP} && \
 | 
			
		||||
  chmod +x /usr/local/bin/protoc && \
 | 
			
		||||
  chmod -R +r /usr/local/include/google \
 | 
			
		||||
;fi
 | 
			
		||||
@@ -1757,8 +1756,10 @@ RUN set -eux; \
 | 
			
		||||
      make &&\
 | 
			
		||||
      make install &&\
 | 
			
		||||
      rm /tmp/libevent.tar.gz &&\
 | 
			
		||||
      echo "extension=sockets.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini && \
 | 
			
		||||
      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \
 | 
			
		||||
      if [ ! -f /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini ]; then\
 | 
			
		||||
        echo "extension=sockets.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini; \
 | 
			
		||||
      fi &&\
 | 
			
		||||
      ln -sf /etc/php/${LARADOCK_PHP_VERSION}/mods-available/sockets.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-sockets.ini && \
 | 
			
		||||
      curl -L -o /tmp/event.tar.gz http://pecl.php.net/get/event-3.0.6.tgz &&\
 | 
			
		||||
      mkdir -p /tmp/event-php &&\
 | 
			
		||||
      tar -C /tmp/event-php -zxvf /tmp/event.tar.gz --strip 1 &&\
 | 
			
		||||
@@ -1769,11 +1770,21 @@ RUN set -eux; \
 | 
			
		||||
      make install &&\
 | 
			
		||||
      rm /tmp/event.tar.gz &&\
 | 
			
		||||
      echo "extension=event.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini && \
 | 
			
		||||
      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-event.ini && \
 | 
			
		||||
      ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/event.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/30-event.ini && \
 | 
			
		||||
      php -m  | grep -q 'event' \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
###########################################################################
 | 
			
		||||
# DNS utilities:
 | 
			
		||||
###########################################################################
 | 
			
		||||
 | 
			
		||||
USER root
 | 
			
		||||
 | 
			
		||||
ARG INSTALL_DNSUTILS=false
 | 
			
		||||
 | 
			
		||||
RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
 | 
			
		||||
    apt-get update && apt-get install -y dnsutils \
 | 
			
		||||
;fi
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
#--------------------------------------------------------------------------
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user