fix: more fixes for nginx based testing ci dockers (openemr#7749)

bradymiller · Oct 2, 2024 · b884ee1 · b884ee1
1 parent df05199
commit b884ee1
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/docker/library/dockers/dev-php-fpm-8-3-redis/Dockerfile b/docker/library/dockers/dev-php-fpm-8-3-redis/Dockerfile
@@ -20,7 +20,11 @@ RUN apt-get update
 #  and instead rely on php scripts, if possible.
 RUN apt-get install -y mariadb-client \
                        imagemagick \
-                       nodejs
+                       curl
+
+# Install correct version nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x  | sudo bash -
+RUN apt install nodejs
 
 # Add the php extensions (note using a very cool script by mlocati to do this)
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

diff --git a/docker/library/dockers/dev-php-fpm-8-3/Dockerfile b/docker/library/dockers/dev-php-fpm-8-3/Dockerfile
@@ -20,7 +20,11 @@ RUN apt-get update
 #  and instead rely on php scripts, if possible.
 RUN apt-get install -y mariadb-client \
                        imagemagick \
-                       nodejs
+                       curl
+
+# Install correct version nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x  | sudo bash -
+RUN apt install nodejs
 
 # Add the php extensions (note using a very cool script by mlocati to do this)
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

diff --git a/docker/library/dockers/dev-php-fpm-8-4-redis/Dockerfile b/docker/library/dockers/dev-php-fpm-8-4-redis/Dockerfile
@@ -9,7 +9,7 @@
 # php-fpm Dockerfile build for openemr development docker environment
 # This docker is hosted here: https://hub.docker.com/r/openemr/dev-php-fpm/ <tag is 7.2>
 #
-FROM php:8.4-rc-fpm
+FROM openemr/dev-php-fpm:pre-build-dev-84
 
 # Update
 RUN apt-get update
@@ -20,7 +20,11 @@ RUN apt-get update
 #  and instead rely on php scripts, if possible.
 RUN apt-get install -y mariadb-client \
                        imagemagick \
-                       nodejs
+                       curl
+
+# Install correct version nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x  | sudo bash -
+RUN apt install nodejs
 
 # Add the php extensions (note using a very cool script by mlocati to do this)
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/

diff --git a/docker/library/dockers/dev-php-fpm-8-4/Dockerfile b/docker/library/dockers/dev-php-fpm-8-4/Dockerfile
@@ -9,7 +9,7 @@
 # php-fpm Dockerfile build for openemr development docker environment
 # This docker is hosted here: https://hub.docker.com/r/openemr/dev-php-fpm/ <tag is 7.2>
 #
-FROM php:8.4-rc-fpm
+FROM openemr/dev-php-fpm:pre-build-dev-84
 
 # Update
 RUN apt-get update
@@ -20,7 +20,11 @@ RUN apt-get update
 #  and instead rely on php scripts, if possible.
 RUN apt-get install -y mariadb-client \
                        imagemagick \
-                       nodejs
+                       curl
+
+# Install correct version nodejs
+RUN curl -sL https://deb.nodesource.com/setup_20.x  | sudo bash -
+RUN apt install nodejs
 
 # Add the php extensions (note using a very cool script by mlocati to do this)
 ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/