Merge remote-tracking branch 'origin/main'

meeting-room-booking-system · May 29, 2024 · 1509444 · 1509444
2 parents c285a1f + 178223d
commit 1509444
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,8 @@
 FROM php:8.2-apache
 
 RUN a2enmod rewrite
-RUN apt-get update && apt-get install -y libicu72 libicu-dev
+RUN apt-get update && apt-get install -y libicu72 libicu-dev locales-all
 RUN docker-php-ext-install mysqli pdo pdo_mysql intl
-RUN apt-get update && apt-get install -y locales && \
-  sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen && \
-  sed -i 's/^# *\(en_GB.UTF-8\)/\1/' /etc/locale.gen && \
-  locale-gen
 
 COPY web/ /var/www/html/
 COPY docker-config.inc.php /var/www/html/config.inc.php
diff --git a/docker_app/php/Dockerfile b/docker_app/php/Dockerfile
@@ -1,7 +1,5 @@
 FROM php:7.3-apache
 
 RUN a2enmod rewrite
-RUN docker-php-ext-install mysqli
-
-#COPY docker_app/php.ini/ $PHP_INI_DIR/conf.d/
+RUN apt-get update && apt-get install -y locales-all
 RUN docker-php-ext-install mysqli pdo pdo_mysql