fix docker

eucyt · May 9, 2023 · d823de3 · d823de3
1 parent 2d5d294
commit d823de3
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 15 deletions.
diff --git a/.idea/mypaper.iml b/.idea/mypaper.iml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
@@ -1,10 +1,9 @@
 server {
     listen 80;
-    server_name example.com;
-    root /work/public;
+    listen [::]:80;
+    root /var/www/public;
 
     add_header X-Frame-Options "SAMEORIGIN";
-    add_header X-XSS-Protection "1; mode=block";
     add_header X-Content-Type-Options "nosniff";
 
     index index.php;
@@ -29,4 +28,4 @@ server {
     location ~ /\.(?!well-known).* {
         deny all;
     }
-}
+}
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -1,21 +1,13 @@
 FROM php:8.2-fpm-buster
-SHELL ["/bin/bash", "-oeux", "pipefail", "-c"]
 
-ENV COMPOSER_ALLOW_SUPERUSER=1 \
-  COMPOSER_HOME=/composer
-
-COPY --from=composer:2.0 /usr/bin/composer /usr/bin/composer
+COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 RUN apt-get update && \
   apt-get -y install git unzip libzip-dev libicu-dev libonig-dev && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* && \
   docker-php-ext-install intl pdo_mysql zip bcmath
 
-RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
-RUN apt-get install -y nodejs
-RUN npm install npm@latest -g
-
 COPY ./php.ini /usr/local/etc/php/php.ini
 
-WORKDIR /work
+WORKDIR /var/www