Merge pull request #1152 from csrdelft/fix-docker

Fix Docker
csrdelft · Oct 27, 2023 · 0fad224 · 0fad224
2 parents fe3d064 + bb471c4
commit 0fad224
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker/Dockerfile-stek b/docker/Dockerfile-stek
@@ -9,8 +9,9 @@ RUN apt-get update \
 # install php extensions
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
 	&& docker-php-ext-install mysqli pdo pdo_mysql hash exif gd opcache intl \
-	&& pecl install xdebug\
-	&& pecl install memcached\
+	# Laatste versie van xdebug werkt alleen met PHP 8
+	&& pecl install xdebug-3.1.5 \
+	&& pecl install memcached \
 	&& docker-php-ext-enable xdebug memcached
 
 # enable apache mods

diff --git a/docker/Dockerfile-yarn b/docker/Dockerfile-yarn
@@ -1,4 +1,4 @@
-FROM node:12-alpine
+FROM node:16-alpine
 
 RUN apk add --no-cache \
 	git \
@@ -15,5 +15,4 @@ RUN npm install -g cross-env webpack-cli
 
 WORKDIR /app
 
-ENTRYPOINT ["yarn"]
-CMD ["run", "docker"]
+CMD yarn install && yarn docker