Skip to content

Commit

Permalink
Merge branch 'master' into pdo_sqlsrv
Browse files Browse the repository at this point in the history
  • Loading branch information
boboldehampsink committed Dec 11, 2024
2 parents 53efe5c + e4fb868 commit de75157
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG IMAGICK_EXT_VERSION=3.7.0
ARG PCOV_EXT_VERSION=1.0.11
ARG HTTPD_VERSION=2.4.62
ARG NGINX_VERSION=1.26.2
ARG NODE_VERSION=20.18.1
ARG NODE_VERSION=22.12.0
ARG COMPOSER_VERSION=2.8.3

# Inherit from Heroku's stack
Expand Down Expand Up @@ -153,7 +153,7 @@ ONBUILD RUN composer install --prefer-dist --no-scripts --no-progress --no-inter

# run yarn install
ONBUILD COPY *package*.json *yarn.lock .yarn* *.npmrc Dockerfile /app/user/
ONBUILD RUN [ -f yarn.lock ] && yarn install --no-progress --ignore-scripts --network-timeout 1000000 || yarn install --mode=skip-build --network-timeout 1000000
ONBUILD RUN [ -f yarn.lock ] && yarn install --mode=skip-build --network-timeout 1000000 || true

# rest of app
ONBUILD COPY . /app/user/
Expand All @@ -164,4 +164,4 @@ ONBUILD RUN composer dump-autoload

# run yarn hooks
ENV CPPFLAGS="-DPNG_ARM_NEON_OPT=0"
ONBUILD RUN [ -f yarn.lock ] && yarn install --force --no-progress || yarn rebuild
ONBUILD RUN [ -f yarn.lock ] && yarn rebuild
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ Usage: `FROM ghcr.io/robuust/heroku-php:pdo_sqlsrv`
* Nginx
* PHP 8.3.x with Redis, Imagick, PCov and PDO SQL Server
* Composer 2
* Node 20.x
* Yarn (classic and modern)
* Chrome
* ChromeDriver
* Node 22.x
* Yarn 4.x

0 comments on commit de75157

Please sign in to comment.