...
 
Commits (13)
    https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/dd7be70596c3f5d0987329855b404e9b16c27b52 Add Java Development Kit 2023-06-17T14:21:34+03:00 Pavel Bychko box@abordage.dev https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/e9522b230c3d8889cf3324b8199425bbab56fc7b build(deps): bump tough-cookie and node-sass in /react 2023-07-08T21:03:17+00:00 dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Bumps [tough-cookie](<a href="https://github.com/salesforce/tough-cookie" rel="nofollow noreferrer noopener" target="_blank">https://github.com/salesforce/tough-cookie</a>) to 4.1.3 and updates ancestor dependency [node-sass](<a href="https://github.com/sass/node-sass" rel="nofollow noreferrer noopener" target="_blank">https://github.com/sass/node-sass</a>). These dependencies need to be updated together. Updates `tough-cookie` from 4.1.2 to 4.1.3 - [Release notes](<a href="https://github.com/salesforce/tough-cookie/releases" rel="nofollow noreferrer noopener" target="_blank">https://github.com/salesforce/tough-cookie/releases</a>) - [Changelog](<a href="https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md" rel="nofollow noreferrer noopener" target="_blank">https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md</a>) - [Commits](<a href="https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3" rel="nofollow noreferrer noopener" target="_blank">https://github.com/salesforce/tough-cookie/compare/v4.1.2...v4.1.3</a>) Updates `node-sass` from 7.0.3 to 9.0.0 - [Release notes](<a href="https://github.com/sass/node-sass/releases" rel="nofollow noreferrer noopener" target="_blank">https://github.com/sass/node-sass/releases</a>) - [Changelog](<a href="https://github.com/sass/node-sass/blob/master/CHANGELOG.md" rel="nofollow noreferrer noopener" target="_blank">https://github.com/sass/node-sass/blob/master/CHANGELOG.md</a>) - [Commits](<a href="https://github.com/sass/node-sass/compare/v7.0.3...v9.0.0" rel="nofollow noreferrer noopener" target="_blank">https://github.com/sass/node-sass/compare/v7.0.3...v9.0.0</a>) --- updated-dependencies: - dependency-name: tough-cookie dependency-type: indirect - dependency-name: node-sass dependency-type: direct:production ... Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:support@github.com" title="support@github.com"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg5" style="text-decoration: none">N</a><a href="mailto:support@github.com" title="support@github.com">dependabot[bot]</a> &lt;<a href="mailto:support@github.com" title="support@github.com">support@github.com</a>&gt;</span> https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/76534d00162a306f8ed53f710a41a32ec718b68e skip remove file not found error 2023-07-14T21:13:49-04:00 Rex chep6915@gmail.com skip remove file not found error https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/0b5103cd2fb5ec7352e60ebc15e90d387a24dc05 Merge pull request #7 from makowskid/poppler-utils 2023-07-18T19:36:01+02:00 Dawid Makowski dawid.makowski@gmail.com Adding support for poppler-utils https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/0ec4f6f54470fdef3272291f55fb1051eaa9d299 build(deps): bump word-wrap from 1.2.3 to 1.2.4 in /react 2023-07-19T07:32:41+00:00 dependabot[bot] 49699333+dependabot[bot]@users.noreply.github.com Bumps [word-wrap](<a href="https://github.com/jonschlinkert/word-wrap" rel="nofollow noreferrer noopener" target="_blank">https://github.com/jonschlinkert/word-wrap</a>) from 1.2.3 to 1.2.4. - [Release notes](<a href="https://github.com/jonschlinkert/word-wrap/releases" rel="nofollow noreferrer noopener" target="_blank">https://github.com/jonschlinkert/word-wrap/releases</a>) - [Commits](<a href="https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4" rel="nofollow noreferrer noopener" target="_blank">https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4</a>) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: <span data-trailer="Signed-off-by:"><a href="mailto:support@github.com" title="support@github.com"></a><a href="javascript:void(0)" class="avatar s16 avatar-inline identicon bg2" style="text-decoration: none">N</a><a href="mailto:support@github.com" title="support@github.com">dependabot[bot]</a> &lt;<a href="mailto:support@github.com" title="support@github.com">support@github.com</a>&gt;</span> https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/237dd143da563335c38397eb58381259fbb50934 Merge pull request #3412 from... 2023-07-24T23:19:12+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com Merge pull request #3412 from laradock/dependabot/npm_and_yarn/react/tough-cookie-and-node-sass-4.1.3 build(deps): bump tough-cookie and node-sass in /react https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/0466fbdd273f17dbb1a88c0c4e50b23382555eef Merge pull request #3419 from laradock/dependabot/npm_and_yarn/react/word-wra... 2023-07-24T23:19:33+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com build(deps): bump word-wrap from 1.2.3 to 1.2.4 in /react https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/785d0c968d67c4dd4c88f9f8210d7407dc571b4f Merge pull request #3416 from chep6915/master 2023-07-24T23:20:28+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com fix remove file not found error https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/3b7932eed430171db2e43ebc084d26d1c7c3a76e Merge branch 'master' into add-jdk 2023-07-24T23:21:53+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/b94d5af0e2f726a59909382a247088373b1cd4fd Merge pull request #3402 from abordage/add-jdk 2023-07-24T23:22:04+08:00 Shao Yu-Lung (Allen) bestlong168@gmail.com Add Java Development Kit https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/e021d7a45259a2b3f19cb4dd95264fddee3f3438 Merge pull request #8 from laradock/master 2023-07-31T22:20:18+02:00 Dawid Makowski dawid.makowski@gmail.com fork sync https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/cdcd1037397930670d220096ee14482d28f35405 Adding antiword within poppler-utils package 2023-07-31T23:14:17+02:00 Dawid Makowski dawid.makowski@gmail.com https://gitcode.net/awesome-mirrors/laradock/laradock/-/commit/18776e6baaf7ca9452cfda7fbb3146d0fde1cf95 Merge pull request #3425 from laradock/poppler-add-antiword 2023-08-01T10:43:47+02:00 Dawid Makowski dawid.makowski@gmail.com Poppler-utils: add antiword
......@@ -217,6 +217,7 @@ WORKSPACE_INSTALL_EVENT=false
WORKSPACE_INSTALL_DNSUTILS=true
WORKSPACE_XDEBUG_PORT=9000
WORKSPACE_VITE_PORT=5173
WORKSPACE_INSTALL_JDK=true
### PHP_FPM ###############################################
......
......@@ -2001,7 +2001,7 @@ To install npm-check-updates CLI [here](https://www.npmjs.com/package/npm-check-
<br>
<a name="Install-poppler-utils"></a>
## Install poppler-utils
## Install `poppler-utils` (and `antiword` combined)
Poppler is a PDF rendering library based on Xpdf PDF viewer.
......@@ -2019,6 +2019,8 @@ This package contains command line utilities (based on Poppler) for getting info
* pdftotext -- text extraction
* pdfunite -- document merging tool
`poppler-utils` is often used by popular PDF/DOC parsing packages in combination with `antiword`, hence both are installed when flags in `.env` are set.
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
......
......@@ -297,6 +297,7 @@ services:
- 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
- no_proxy
......
......@@ -218,7 +218,7 @@ USER root
ARG INSTALL_POPPLER_UTILS=false
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
apk add --update --no-cache poppler-utils \
apk add --update --no-cache poppler-utils antiword \
;fi
# Install Cassandra drivers:
......
......@@ -1044,7 +1044,7 @@ USER root
ARG INSTALL_POPPLER_UTILS=false
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
apt-get -y install poppler-utils \
apt-get -y install poppler-utils antiword \
;fi
#####################################
......@@ -1321,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
......
......@@ -271,7 +271,7 @@ USER root
ARG INSTALL_POPPLER_UTILS=false
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
apk add --update --no-cache poppler-utils \
apk add --update --no-cache poppler-utils antiword \
;fi
# Install AMQP:
......
此差异已折叠。
......@@ -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",
......
......@@ -1489,7 +1489,7 @@ USER root
ARG INSTALL_POPPLER_UTILS=false
RUN if [ ${INSTALL_POPPLER_UTILS} = true ]; then \
apt-get -y install poppler-utils \
apt-get -y install poppler-utils antiword \
;fi
#####################################
......@@ -1842,6 +1842,18 @@ RUN if [ ${INSTALL_DNSUTILS} = true ]; then \
apt-get update && apt-get install -y dnsutils \
;fi
###########################################################################
# Java Development Kit:
###########################################################################
ARG INSTALL_JDK=false
RUN if [ ${INSTALL_JDK} = true ]; then \
apt-get update \
&& apt-get install -y default-jdk ca-certificates-java \
&& update-ca-certificates -f \
;fi
#
#--------------------------------------------------------------------------
# Final Touch
......@@ -1853,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