Browse Source

Fixed logs location in Dockerfile, added docker-compose-running.yml for running the application

Moritz Heiber 7 years ago
parent
commit
32d54ecf65
2 changed files with 65 additions and 0 deletions
  1. 1 0
      Dockerfile
  2. 64 0
      docker-compose-running.yml

+ 1 - 0
Dockerfile

@@ -16,6 +16,7 @@ RUN apk add --no-cache --virtual .build build-base autoconf imagemagick-dev libt
   install -d -m0755 -o www-data -g www-data /var/www/html/pixelfed \
     /var/www/html/pixelfed/storage \
     /var/www/html/pixelfed/storage/framework \
+    /var/www/html/pixelfed/storage/logs \
     /var/www/html/pixelfed/storage/framework/sessions \
     /var/www/html/pixelfed/storage/framework/views \
     /var/www/html/pixelfed/storage/framework/cache && \

+ 64 - 0
docker-compose-running.yml

@@ -0,0 +1,64 @@
+---
+version: '3'
+services:
+  nginx:
+    image: nginx:alpine
+    networks:
+      - internal
+      - external
+    ports:
+      - 3000:80
+    volumes:
+      - "php-storage:/var/www/html"
+      - ./contrib/nginx.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      - php
+
+  php:
+    build: .
+    image: pixelfed
+    volumes:
+      - "php-storage:/var/www/html"
+    networks:
+      - internal
+    environment:
+      - DB_HOST=mysql
+      - DB_DATABASE=pixelfed
+      - DB_USERNAME=${DB_USERNAME:-pixelfed}
+      - DB_PASSWORD=${DB_PASSWORD:-pixelfed}
+      - REDIS_HOST=redis
+      - APP_KEY=${APP_KEY}
+    env_file:
+      - ./.env
+
+  mysql:
+    image: mysql:5.7
+    networks:
+      - internal
+    environment:
+      - MYSQL_DATABASE=pixelfed
+      - MYSQL_USER=${DB_USERNAME:-pixelfed}
+      - MYSQL_PASSWORD=${DB_PASSWORD:-pixelfed}
+      - MYSQL_RANDOM_ROOT_PASSWORD="true"
+    env_file:
+      - ./.env
+    volumes:
+      - "mysql-data:/var/lib/mysql"
+
+  redis:
+    image: redis:alpine
+    volumes:
+      - "redis-data:/data"
+    networks:
+      - internal
+
+volumes:
+  redis-data:
+  mysql-data:
+  php-storage:
+
+networks:
+  internal:
+    internal: true
+  external:
+    driver: bridge