Merge branch 'master' into add-jdk
This commit is contained in:
Shao Yu-Lung (Allen)
GitHub
commit
3b7932eed4
@ -122,6 +122,8 @@ WORKSPACE_INSTALL_NPM_GULP=true
|
||||
WORKSPACE_INSTALL_NPM_BOWER=false
|
||||
WORKSPACE_INSTALL_NPM_VUE_CLI=true
|
||||
WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false
|
||||
WORKSPACE_INSTALL_NPM_CHECK_UPDATES_CLI=false
|
||||
WORKSPACE_INSTALL_POPPLER_UTILS=false
|
||||
WORKSPACE_INSTALL_PHPREDIS=true
|
||||
WORKSPACE_INSTALL_WORKSPACE_SSH=false
|
||||
WORKSPACE_INSTALL_SUBVERSION=false
|
||||
@ -290,6 +292,7 @@ PHP_FPM_DEFAULT_LOCALE=POSIX
|
||||
PHP_FPM_XDEBUG_PORT=9000
|
||||
PHP_FPM_INSTALL_EVENT=false
|
||||
PHP_FPM_INSTALL_DNSUTILS=true
|
||||
PHP_FPM_INSTALL_POPPLER_UTILS=false
|
||||
|
||||
PHP_FPM_PUID=1000
|
||||
PHP_FPM_PGID=1000
|
||||
@ -336,6 +339,7 @@ PHP_WORKER_INSTALL_XMLRPC=false
|
||||
PHP_WORKER_INSTALL_SSDB=false
|
||||
PHP_WORKER_INSTALL_EVENT=false
|
||||
PHP_WORKER_INSTALL_INTL=true
|
||||
PHP_WORKER_INSTALL_POPPLER_UTILS=false
|
||||
|
||||
PHP_WORKER_PUID=1000
|
||||
PHP_WORKER_PGID=1000
|
||||
@ -377,6 +381,7 @@ LARAVEL_HORIZON_INSTALL_MONGO=false
|
||||
LARAVEL_HORIZON_INSTALL_CASSANDRA=false
|
||||
LARAVEL_HORIZON_INSTALL_FFMPEG=false
|
||||
LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM=false
|
||||
LARAVEL_HORIZON_INSTALL_POPPLER_UTILS=false
|
||||
LARAVEL_HORIZON_PGID=1000
|
||||
LARAVEL_HORIZON_PUID=1000
|
||||
|
||||
@ -1080,3 +1085,7 @@ KEYCLOAK_POSTGRES_HOST=postgres
|
||||
KEYCLOAK_POSTGRES_USER=laradock_keycloak
|
||||
KEYCLOAK_POSTGRES_PASSWORD=laradock_keycloak
|
||||
KEYCLOAK_POSTGRES_DB=laradock_keycloak
|
||||
|
||||
### Mailpit #################################################
|
||||
MAILPIT_HTTP_PORT=8125
|
||||
MAILPIT_SMTP_PORT=1125
|
||||
|
||||
BIN
.github/home-page-images/custom-sponsors/AU.png
vendored
BIN
.github/home-page-images/custom-sponsors/AU.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
BIN
.github/home-page-images/custom-sponsors/CA.png
vendored
BIN
.github/home-page-images/custom-sponsors/CA.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 8.3 KiB |
BIN
.github/home-page-images/custom-sponsors/PLD.png
vendored
BIN
.github/home-page-images/custom-sponsors/PLD.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.3 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.8 KiB |
BIN
.github/home-page-images/custom-sponsors/sista-ai-icon.png
vendored
Normal file
BIN
.github/home-page-images/custom-sponsors/sista-ai-icon.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
@ -1232,39 +1232,43 @@ A package ([Laravel RethinkDB](https://github.com/duxet/laravel-rethinkdb)) is b
|
||||
## Use Minio
|
||||
|
||||
1. Configure Minio:
|
||||
- On the workspace container, change `INSTALL_MC` to true to get the client
|
||||
- Set `MINIO_ACCESS_KEY` and `MINIO_ACCESS_SECRET` if you wish to set proper keys
|
||||
- You can change some settings in the `.env` file (`MINIO_*`)
|
||||
- You can install Minio Client on the workspace container: `WORKSPACE_INSTALL_MC=true`
|
||||
|
||||
2. Run the Minio Container (`minio`) with the `docker-compose up` command. Example:
|
||||
```bash
|
||||
docker-compose up -d minio
|
||||
```
|
||||
|
||||
3. Open your browser and visit the localhost on port **9000** at the following URL: `http://localhost:9000`
|
||||
4. Create a bucket either through the webui or using the mc client:
|
||||
4. Create a bucket either through the webui or using the Minio Client:
|
||||
```bash
|
||||
mc mb minio/bucket
|
||||
```
|
||||
5 - When configuring your other clients use the following details:
|
||||
```
|
||||
AWS_URL=http://minio:9000
|
||||
AWS_ACCESS_KEY_ID=access
|
||||
AWS_SECRET_ACCESS_KEY=secretkey
|
||||
AWS_DEFAULT_REGION=us-east-1
|
||||
AWS_BUCKET=test
|
||||
AWS_PATH_STYLE=true
|
||||
```
|
||||
6 - In `filesystems.php` you shoud use the following details (s3):
|
||||
```
|
||||
's3' => [
|
||||
'driver' => 's3',
|
||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||
'secret' => env('AWS_SECRET_ACCESS_KEY'),
|
||||
'region' => env('AWS_DEFAULT_REGION'),
|
||||
'bucket' => env('AWS_BUCKET'),
|
||||
'endpoint' => env('AWS_URL'),
|
||||
'use_path_style_endpoint' => env('AWS_PATH_STYLE', false)
|
||||
],
|
||||
```
|
||||
`'AWS_PATH_STYLE'` shout set to true only for local purpouse
|
||||
5. When configuring your other clients use the following details:
|
||||
```
|
||||
AWS_URL=http://minio:9000
|
||||
AWS_ACCESS_KEY_ID=access
|
||||
AWS_SECRET_ACCESS_KEY=secretkey
|
||||
AWS_DEFAULT_REGION=us-east-1
|
||||
AWS_BUCKET=test
|
||||
AWS_USE_PATH_STYLE_ENDPOINT=true
|
||||
```
|
||||
|
||||
6. In `filesystems.php` you should use the following details (s3):
|
||||
```php
|
||||
's3' => [
|
||||
'driver' => 's3',
|
||||
'key' => env('AWS_ACCESS_KEY_ID'),
|
||||
'secret' => env('AWS_SECRET_ACCESS_KEY'),
|
||||
'region' => env('AWS_DEFAULT_REGION'),
|
||||
'bucket' => env('AWS_BUCKET'),
|
||||
'endpoint' => env('AWS_URL'),
|
||||
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false)
|
||||
],
|
||||
```
|
||||
|
||||
`AWS_USE_PATH_STYLE_ENDPOINT` should set to true only for local purpose
|
||||
|
||||
|
||||
|
||||
@ -1507,6 +1511,29 @@ docker-compose up -d keycloak
|
||||
- Username: `admin`
|
||||
- Password: `secret`
|
||||
|
||||
|
||||
<br>
|
||||
<a name="use Mailpit"></a>
|
||||
## Use Mailpit
|
||||
|
||||
1. Run the Mailpit Container (`mailpit`) with the `docker-compose up` command. Example:
|
||||
|
||||
```bash
|
||||
docker-compose up -d mailpit
|
||||
```
|
||||
|
||||
2. Open your browser and visit the localhost on port 8125: `http://localhost:8125`
|
||||
3. Setup config in your Laravel project’s .env file
|
||||
```text
|
||||
MAIL_MAILER=smtp
|
||||
MAIL_HOST=mailpit
|
||||
MAIL_PORT=1125
|
||||
MAIL_USERNAME=null
|
||||
MAIL_PASSWORD=null
|
||||
```
|
||||
|
||||
|
||||
|
||||
<br>
|
||||
<a name="CodeIgniter"></a>
|
||||
|
||||
@ -1958,6 +1985,53 @@ To install NPM ANGULAR CLI in the Workspace container
|
||||
3 - Re-build the container `docker-compose build workspace`
|
||||
|
||||
|
||||
<br>
|
||||
<a name="Install-npm-check-updates"></a>
|
||||
## Install npm-check-updates CLI
|
||||
|
||||
To install npm-check-updates CLI [here](https://www.npmjs.com/package/npm-check-updates) in the Workspace container
|
||||
|
||||
1 - Open the `.env` file
|
||||
|
||||
2 - Make sure Node is also being installed (`WORKSPACE_INSTALL_NODE` set to `true`)
|
||||
|
||||
3 - Search for the `WORKSPACE_INSTALL_NPM_CHECK_UPDATES_CLI` argument under the Workspace Container and set it to `true`
|
||||
|
||||
4 - Re-build the container `docker-compose build workspace`
|
||||
|
||||
<br>
|
||||
<a name="Install-poppler-utils"></a>
|
||||
## Install poppler-utils
|
||||
|
||||
Poppler is a PDF rendering library based on Xpdf PDF viewer.
|
||||
|
||||
This package contains command line utilities (based on Poppler) for getting information of PDF documents, convert them to other formats, or manipulate them:
|
||||
* pdfdetach -- lists or extracts embedded files (attachments)
|
||||
* pdffonts -- font analyzer
|
||||
* pdfimages -- image extractor
|
||||
* pdfinfo -- document information
|
||||
* pdfseparate -- page extraction tool
|
||||
* pdfsig -- verifies digital signatures
|
||||
* pdftocairo -- PDF to PNG/JPEG/PDF/PS/EPS/SVG converter using Cairo
|
||||
* pdftohtml -- PDF to HTML converter
|
||||
* pdftoppm -- PDF to PPM/PNG/JPEG image converter
|
||||
* pdftops -- PDF to PostScript (PS) converter
|
||||
* pdftotext -- text extraction
|
||||
* pdfunite -- document merging tool
|
||||
|
||||
To install `poppler-utils` [(more here)](https://packages.debian.org/sid/poppler-utils) in any of the `workspace/php-fpm/php-worker/laravel-horizon` container
|
||||
|
||||
1 - Open the `.env` file
|
||||
|
||||
2 - Search for the `WORKSPACE_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
|
||||
|
||||
3 - Search for the `PHP_FPM_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
|
||||
|
||||
4 - Search for the `PHP_WORKER_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
|
||||
|
||||
5 - Search for the `LARAVEL_HORIZON_INSTALL_POPPLER_UTILS` argument under the Workspace Container and set it to `true`
|
||||
|
||||
6 - Re-build the container `docker-compose build workspace php-fpm php-worker laravel-horizon`
|
||||
|
||||
|
||||
|
||||
|
||||
@ -386,10 +386,11 @@ Sponsoring is an act of giving in a different fashion. 🌱
|
||||
|
||||
<p align="center">
|
||||
|
||||
<a href="https://kasynohex.com/" target="_blank" style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/PLD.png" height="75px" alt="KasynoHEX.com Polska"></a>
|
||||
<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://sista.ai/" target="_blank" style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/sista-ai-icon.png" height="75px" alt="Sista AI - Unlock Your Full Potential With a Personal AI Coach. (www.sista.ai)"></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://kasynohex.com/" target="_blank" style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/PLD.png" height="75px" alt="KasynoHEX.com Polska"></a> -->
|
||||
<!-- <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="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> -->
|
||||
|
||||
|
||||
@ -192,10 +192,11 @@ Sponsoring is an act of giving in a different fashion. 🌱
|
||||
|
||||
<p align="center">
|
||||
|
||||
<a href="https://kasynohex.com/" target="_blank" style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/PLD.png" height="75px" alt="KasynoHEX.com Polska"></a>
|
||||
<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://sista.ai/" target="_blank" style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/sista-ai-icon.png" height="75px" alt="Sista AI - Unlock Your Full Potential With a Personal AI Coach. (www.sista.ai)"></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://kasynohex.com/" target="_blank" style="margin-right: 4em"><img src="https://raw.githubusercontent.com/laradock/laradock/master/.github/home-page-images/custom-sponsors/PLD.png" height="75px" alt="KasynoHEX.com Polska"></a> -->
|
||||
<!-- <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="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> -->
|
||||
|
||||
|
||||
@ -102,6 +102,7 @@ services:
|
||||
- INSTALL_NPM_BOWER=${WORKSPACE_INSTALL_NPM_BOWER}
|
||||
- INSTALL_NPM_VUE_CLI=${WORKSPACE_INSTALL_NPM_VUE_CLI}
|
||||
- INSTALL_NPM_ANGULAR_CLI=${WORKSPACE_INSTALL_NPM_ANGULAR_CLI}
|
||||
- INSTALL_NPM_CHECK_UPDATES_CLI=${WORKSPACE_INSTALL_NPM_CHECK_UPDATES_CLI}
|
||||
- INSTALL_DRUSH=${WORKSPACE_INSTALL_DRUSH}
|
||||
- INSTALL_WP_CLI=${WORKSPACE_INSTALL_WP_CLI}
|
||||
- INSTALL_DRUPAL_CONSOLE=${WORKSPACE_INSTALL_DRUPAL_CONSOLE}
|
||||
@ -176,6 +177,7 @@ services:
|
||||
- INSTALL_MEMCACHED=${WORKSPACE_INSTALL_MEMCACHED}
|
||||
- INSTALL_EVENT=${WORKSPACE_INSTALL_EVENT}
|
||||
- INSTALL_DNSUTILS=${WORKSPACE_INSTALL_DNSUTILS}
|
||||
- INSTALL_POPPLER_UTILS=${WORKSPACE_INSTALL_POPPLER_UTILS}
|
||||
- http_proxy
|
||||
- https_proxy
|
||||
- no_proxy
|
||||
@ -294,6 +296,7 @@ services:
|
||||
- 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}
|
||||
- INSTALL_POPPLER_UTILS=${PHP_FPM_INSTALL_POPPLER_UTILS}
|
||||
- INSTALL_JDK=${WORKSPACE_INSTALL_JDK}
|
||||
- http_proxy
|
||||
- https_proxy
|
||||
@ -360,6 +363,7 @@ services:
|
||||
- INSTALL_SSDB=${PHP_WORKER_INSTALL_SSDB}
|
||||
- INSTALL_EVENT=${PHP_WORKER_INSTALL_EVENT}
|
||||
- INSTALL_INTL=${PHP_WORKER_INSTALL_INTL}
|
||||
- INSTALL_POPPLER_UTILS=${PHP_WORKER_INSTALL_POPPLER_UTILS}
|
||||
- PUID=${PHP_WORKER_PUID}
|
||||
- PGID=${PHP_WORKER_PGID}
|
||||
- IMAGEMAGICK_VERSION=${PHP_WORKER_IMAGEMAGICK_VERSION}
|
||||
@ -396,6 +400,7 @@ services:
|
||||
- INSTALL_MONGO=${LARAVEL_HORIZON_INSTALL_MONGO}
|
||||
- INSTALL_FFMPEG=${LARAVEL_HORIZON_INSTALL_FFMPEG}
|
||||
- INSTALL_AUDIOWAVEFORM=${LARAVEL_HORIZON_INSTALL_AUDIOWAVEFORM}
|
||||
- INSTALL_POPPLER_UTILS=${LARAVEL_HORIZON_INSTALL_POPPLER_UTILS}
|
||||
- PUID=${LARAVEL_HORIZON_PUID}
|
||||
- PGID=${LARAVEL_HORIZON_PGID}
|
||||
- IMAGEMAGICK_VERSION=${LARAVEL_HORIZON_IMAGEMAGICK_VERSION}
|
||||
@ -1157,6 +1162,16 @@ services:
|
||||
- frontend
|
||||
- backend
|
||||
|
||||
### Mailpit ##############################################
|
||||
mailpit:
|
||||
build: ./mailpit
|
||||
ports:
|
||||
- "${MAILPIT_HTTP_PORT}:8025"
|
||||
- "${MAILPIT_SMTP_PORT}:1025"
|
||||
networks:
|
||||
- frontend
|
||||
- backend
|
||||
|
||||
### Selenium ###############################################
|
||||
selenium:
|
||||
build: ./selenium
|
||||
|
||||
@ -210,6 +210,16 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
|
||||
&& make install \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# poppler-utils:
|
||||
#####################################
|
||||
USER root
|
||||
|
||||
ARG INSTALL_POPPLER_UTILS=false
|
||||
|
||||
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
|
||||
apk add --update --no-cache poppler-utils \
|
||||
;fi
|
||||
|
||||
# Install Cassandra drivers:
|
||||
ARG INSTALL_CASSANDRA=false
|
||||
|
||||
3
mailpit/Dockerfile
Normal file
3
mailpit/Dockerfile
Normal file
@ -0,0 +1,3 @@
|
||||
FROM axllent/mailpit
|
||||
|
||||
LABEL maintainer="reishou <reishou90@gmail.com>"
|
||||
@ -637,6 +637,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
|
||||
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_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.0.1; \
|
||||
elif [ $(php -r "echo PHP_MAJOR_VERSION . PHP_MINOR_VERSION;") = "81" ]; then \
|
||||
echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.2.1; \
|
||||
else \
|
||||
echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \
|
||||
fi \
|
||||
@ -1034,6 +1036,16 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
|
||||
&& make install \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# poppler-utils:
|
||||
#####################################
|
||||
USER root
|
||||
|
||||
ARG INSTALL_POPPLER_UTILS=false
|
||||
|
||||
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
|
||||
apt-get -y install poppler-utils \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# wkhtmltopdf:
|
||||
@ -1309,7 +1321,7 @@ USER root
|
||||
# Clean up
|
||||
RUN apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
|
||||
rm /var/log/lastlog /var/log/faillog
|
||||
rm -f /var/log/lastlog /var/log/faillog
|
||||
|
||||
# Configure non-root user.
|
||||
ARG PUID=1000
|
||||
|
||||
@ -263,6 +263,17 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
|
||||
&& make install \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# poppler-utils:
|
||||
#####################################
|
||||
USER root
|
||||
|
||||
ARG INSTALL_POPPLER_UTILS=false
|
||||
|
||||
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
|
||||
apk add --update --no-cache poppler-utils \
|
||||
;fi
|
||||
|
||||
# Install AMQP:
|
||||
ARG INSTALL_AMQP=false
|
||||
|
||||
|
||||
785
react/package-lock.json
generated
785
react/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -12,7 +12,7 @@
|
||||
"axios": "^0.21.2",
|
||||
"bootstrap": "^4.5.3",
|
||||
"jss-rtl": "^0.3.0",
|
||||
"node-sass": "^7.0.3",
|
||||
"node-sass": "^9.0.0",
|
||||
"prop-types": "^15.7.2",
|
||||
"react": "^17.0.1",
|
||||
"react-bootstrap": "^1.4.0",
|
||||
|
||||
@ -738,6 +738,7 @@ ARG INSTALL_NPM_GULP=false
|
||||
ARG INSTALL_NPM_BOWER=false
|
||||
ARG INSTALL_NPM_VUE_CLI=false
|
||||
ARG INSTALL_NPM_ANGULAR_CLI=false
|
||||
ARG INSTALL_NPM_CHECK_UPDATES_CLI=false
|
||||
ARG NPM_REGISTRY
|
||||
ENV NPM_REGISTRY ${NPM_REGISTRY}
|
||||
ARG NPM_FETCH_RETRIES
|
||||
@ -780,6 +781,9 @@ RUN if [ ${INSTALL_NODE} = true ]; then \
|
||||
&& if [ ${INSTALL_NPM_ANGULAR_CLI} = true ]; then \
|
||||
npm install -g @angular/cli \
|
||||
;fi \
|
||||
&& if [ ${INSTALL_NPM_CHECK_UPDATES_CLI} = true ]; then \
|
||||
npm install -g npm-check-updates \
|
||||
;fi \
|
||||
;fi
|
||||
|
||||
# Wouldn't execute when added to the RUN statement in the above block
|
||||
@ -962,6 +966,8 @@ RUN if [ ${INSTALL_OCI8} = true ]; then \
|
||||
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_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.0.1; \
|
||||
elif [ $(php -r "echo PHP_MAJOR_VERSION . PHP_MINOR_VERSION;") = "81" ]; then \
|
||||
echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8-3.2.1; \
|
||||
else \
|
||||
echo "instantclient,/opt/oracle/instantclient_${ORACLE_INSTANT_CLIENT_VERSION}/" | pecl install oci8; \
|
||||
fi \
|
||||
@ -1475,6 +1481,17 @@ RUN if [ ${INSTALL_AUDIOWAVEFORM} = true ]; then \
|
||||
&& make install \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# poppler-utils:
|
||||
#####################################
|
||||
USER root
|
||||
|
||||
ARG INSTALL_POPPLER_UTILS=false
|
||||
|
||||
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
|
||||
apt-get -y install poppler-utils \
|
||||
;fi
|
||||
|
||||
#####################################
|
||||
# wkhtmltopdf:
|
||||
#####################################
|
||||
@ -1848,7 +1865,7 @@ USER root
|
||||
# Clean up
|
||||
RUN apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
|
||||
rm /var/log/lastlog /var/log/faillog
|
||||
rm -f /var/log/lastlog /var/log/faillog
|
||||
|
||||
# Set default work directory
|
||||
WORKDIR /var/www
|
||||
|
||||
Loading…
Reference in New Issue
Block a user