Merge pull request #1806 from Strubbl/docker-fixes

Docker fixes

Dockerfile

@@ -1 +0,0 @@
-contrib/docker/Dockerfile.apache

contrib/docker/Dockerfile.apache

@@ -8,7 +8,7 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends git gosu \
       optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \
       libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \
-      libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \
+      libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\
  && sed -i '/en_US/s/^#//g' /etc/locale.gen \
  && locale-gen && update-locale \
  && docker-php-source extract \

contrib/docker/Dockerfile.fpm

@@ -8,7 +8,7 @@ RUN apt-get update \
  && apt-get install -y --no-install-recommends git gosu \
       optipng pngquant jpegoptim gifsicle libpq-dev libsqlite3-dev locales zip unzip libzip-dev libcurl4-openssl-dev \
       libfreetype6 libicu-dev libjpeg62-turbo libpng16-16 libxpm4 libwebp6 libmagickwand-6.q16-6 \
-      libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev \
+      libfreetype6-dev libjpeg62-turbo-dev libpng-dev libxpm-dev libwebp-dev libmagickwand-dev mariadb-client\
  && sed -i '/en_US/s/^#//g' /etc/locale.gen \
  && locale-gen && update-locale \
  && docker-php-source extract \

docker-compose.yml

@@ -14,7 +14,10 @@ services:
 
   app:
     # Comment to use dockerhub image
-    build: .
+    build:
+      context: .
+      dockerfile: contrib/docker/Dockerfile.apache
+      #dockerfile: contrib/docker/Dockerfile.fpm
     image: pixelfed
     restart: unless-stopped
     ## If you have a traefik running, uncomment this to expose Pixelfed
@@ -36,7 +39,10 @@ services:
 
   worker:  # Comment this whole block if HORIZON_EMBED is true.
     # Comment to use dockerhub image
-    build: .
+    build:
+      context: .
+      dockerfile: contrib/docker/Dockerfile.apache
+      #dockerfile: contrib/docker/Dockerfile.fpm
     image: pixelfed
     restart: unless-stopped
     env_file:
@@ -54,6 +60,7 @@ services:
     restart: unless-stopped
     networks:
       - internal
+    command: --default-authentication-plugin=mysql_native_password
     environment:
       - MYSQL_DATABASE=pixelfed
       - MYSQL_USER=${DB_USERNAME}
@@ -65,6 +72,10 @@ services:
   redis:
     image: redis:5-alpine
     restart: unless-stopped
+    env_file:
+      - ./.env
+    ports:
+      - "6379:6379"
     volumes:
       - "redis-data:/data"
     networks: