diff --git a/docker-compose.yml b/docker-compose.yml index 8f5e22c8..bdd5fc86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ services: ports: - "9091:80" depends_on: - - db + - leftypol-db volumes: - ./local-www:/var/www/html - ./docker/nginx/leftypol.conf:/etc/nginx/conf.d/default.conf @@ -29,7 +29,7 @@ services: leftchan_net: ipv4_address: 172.21.0.4 #MySQL Service - db: + leftypol-db: image: mysql:8.0.35 container_name: leftypol-db restart: unless-stopped @@ -38,7 +38,8 @@ services: - "3306:3306" environment: MYSQL_DATABASE: vichan - MYSQL_ROOT_PASSWORD: test-database + MYSQL_ROOT_PASSWORD: password + command: "--default-authentication-plugin=mysql_native_password" networks: leftchan_net: ipv4_address: 172.21.0.2 diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 42f61541..48694790 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,7 +1,7 @@ # Based on https://github.com/dead-guru/devichan/blob/master/php-fpm/Dockerfile FROM composer AS composer -FROM php:8.1-fpm-alpine +FROM php:7.2-fpm-alpine RUN apk add --no-cache \ zlib \ @@ -32,8 +32,8 @@ RUN apk add --no-cache \ pcre-dev \ $PHPIZE_DEPS \ && docker-php-ext-configure gd \ - --with-webp=/usr/include/webp \ - --with-jpeg=/usr/include \ + --with-webp-dir=/usr/include/webp \ + --with-jpeg-dir=/usr/include \ && docker-php-ext-install -j$(nproc) \ gd \ curl \