From 1addf5888d9a0629ce883b2b3bab24ad242b8380 Mon Sep 17 00:00:00 2001
From: Victor Vasiloi <victor.vasiloi@gmail.com>
Date: Thu, 8 Dec 2022 14:01:17 +0200
Subject: [PATCH 1/2] fix fixtures images

1. mount media volume to migrations container so fixture images are available in php and nginx container
2. change nginx user and group to match php's, so it can read image cache files
---
 Dockerfile              |  9 +++++++++
 docker-compose.yml      |  8 ++++++++
 docker/nginx/nginx.conf | 31 +++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 docker/nginx/nginx.conf

diff --git a/Dockerfile b/Dockerfile
index 63b9f8de40..b49a904dfe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -118,6 +118,15 @@ COPY --from=sylius_node /srv/sylius/public/build public/build
 
 FROM nginx:${NGINX_VERSION}-alpine AS sylius_nginx
 
+ARG GID=82
+ARG UID=82
+ARG USERNAME="www-data"
+
+RUN set -x; \
+    addgroup -g $GID -S $USERNAME; \
+    adduser -S -D -H -u $UID -h /var/cache/nginx -s /sbin/nologin -G $USERNAME -g $USERNAME $USERNAME
+
+COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY docker/nginx/conf.d/default.conf /etc/nginx/conf.d/
 
 WORKDIR /srv/sylius
diff --git a/docker-compose.yml b/docker-compose.yml
index 72e58f5745..6a58309d77 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,6 +36,14 @@ services:
       - DATABASE_URL=mysql://sylius:${MYSQL_PASSWORD:-nopassword}@mysql/sylius
       - LOAD_FIXTURES=1
       - PHP_DATE_TIMEZONE=${PHP_DATE_TIMEZONE:-UTC}
+    volumes:
+      - .:/srv/sylius:rw,cached
+      # if you develop on Linux, you may use a bind-mounted host directory instead
+      # - ./var:/srv/sylius/var:rw
+      - ./public:/srv/sylius/public:rw,delegated
+      # if you develop on Linux, you may use a bind-mounted host directory instead
+      # - ./public/media:/srv/sylius/public/media:rw
+      - public-media:/srv/sylius/public/media:rw
 
   mysql:
     container_name: mysql
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
new file mode 100644
index 0000000000..b7171b4a86
--- /dev/null
+++ b/docker/nginx/nginx.conf
@@ -0,0 +1,31 @@
+user  www-data;
+worker_processes  auto;
+
+error_log  /var/log/nginx/error.log notice;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}

From 147ae5e55ef14d283613bad568baf49d30d84ddf Mon Sep 17 00:00:00 2001
From: Victor Vasiloi <victor.vasiloi@gmail.com>
Date: Fri, 9 Dec 2022 14:38:26 +0200
Subject: [PATCH 2/2] make the image files created by fixtures accessible by
 fpm which runs with user www-data

---
 docker/migrations/docker-entrypoint.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/migrations/docker-entrypoint.sh b/docker/migrations/docker-entrypoint.sh
index 6f3311c340..8d32d39301 100755
--- a/docker/migrations/docker-entrypoint.sh
+++ b/docker/migrations/docker-entrypoint.sh
@@ -22,4 +22,7 @@ php bin/console doctrine:migrations:migrate --no-interaction
 
 if [ "$LOAD_FIXTURES" = "1" ]; then
     php bin/console sylius:fixtures:load --no-interaction
+
+    # make the image files created by fixtures accessible by fpm which runs with user www-data
+    chown -R www-data:www-data public/media/image
 fi