Merge pull request #3 from monopayments/master

Docker ready for use at 2.0.8

docker-compose.yml

@@ -2,35 +2,22 @@ version: '3.7'
 
 services:
   nginx:
-    image: nginx
+    build: ./nginx
     ports:
       - 8080:80
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d:ro
-      - .:/var/www/akaunting.test
+      - app-data:/var/www/akaunting
     restart: unless-stopped
-    networks:
-      akaunting:
-        aliases:
-          - akaunting.test
 
-  app:
+  php:
     build: ./php
-    user: "1000:1000"
-    expose:
-      - 9000
     volumes:
-      - .:/var/www/akaunting.test
+      - app-data:/var/www/akaunting
     restart: unless-stopped
-    environment:
-      APP_DEBUG: "true"
-    networks:
-      - akaunting
 
-  mysql:
-    image: mysql:5
-    ports:
-      - 3306:3306
+  db:
+    image: mysql:latest
     volumes:
       - db-data:/var/lib/mysql
     environment:
@@ -38,12 +25,18 @@ services:
       MYSQL_DATABASE: akaunting_db
       MYSQL_USER: akaunting_admin
       MYSQL_PASSWORD: akaunting_password
-    networks:
-      - akaunting
     command: --default-authentication-plugin=mysql_native_password
 
-volumes:
-  db-data:
 
-networks:
-  akaunting:
+#    image: postgres:alpine
+#    volumes:
+#      - db-data:/var/lib/postgresql/data
+#    environment:
+#      POSTGRES_DB: akaunting_db
+#      POSTGRES_USER: akaunting_admin
+#      POSTGRES_PASSWORD: akaunting_password
+#    ports:
+#        - "5432:5432"
+volumes:
+  app-data:
+  db-data:

nginx/Dockerfile

@@ -0,0 +1,12 @@
+FROM nginx:alpine
+
+ENV AKAUNTING_VERSION 2.0.8
+
+RUN apk update && apk add --no-progress -q wget unzip
+
+RUN wget https://github.com/akaunting/akaunting/releases/download/${AKAUNTING_VERSION}/Akaunting_${AKAUNTING_VERSION}-Stable.zip
+RUN mkdir -p /var/www/akaunting
+RUN unzip Akaunting_${AKAUNTING_VERSION}-Stable.zip -d /var/www/akaunting
+RUN rm Akaunting_${AKAUNTING_VERSION}-Stable.zip
+
+RUN chmod -R 777 /var/www/akaunting

nginx/conf.d/akaunting.conf

@@ -1,12 +1,12 @@
 server {
-    server_name akaunting.test;
+    server_name akaunting;
     listen 80 default_server;
 
     access_log /dev/stdout;
     error_log /dev/stdout;
 
-    root /var/www/akaunting.test;
-    index index.php index.html;
+    root /var/www/akaunting;
+    index index.html index.htm index.php;
 
     add_header X-Frame-Options "SAMEORIGIN";
     add_header X-XSS-Protection "1; mode=block";
@@ -20,7 +20,7 @@ server {
     }
 
     # Prevent Direct Access To Protected Folders
-    location ~ ^/(^app$|bootstrap|config|database|resources|routes|storage|tests|artisan) {
+    location ~ ^/(^app$|bootstrap|config|database|overrides|resources|routes|storage|tests|artisan) {
         deny all;
     }
 
@@ -29,15 +29,17 @@ server {
         deny all;
     }
 
+    error_page 404 /index.php;
+
     location / {
         try_files $uri $uri/ /index.php?$query_string;
-        gzip_static on;
     }
 
+    # Pass PHP Scripts To FastCGI Server
     location ~ \.php$ {
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass app:9000;
+        fastcgi_pass php:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;

php/Dockerfile

@@ -1,9 +1,10 @@
-FROM php:7.2-fpm
+FROM php:7.4-fpm
 
 RUN apt-get update && apt-get install -y \
-    imagemagick \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
+    libzip-dev \
+    imagemagick \
     libmcrypt-dev \
     libpng-dev \
     libpq-dev \
@@ -13,24 +14,20 @@ RUN apt-get update && apt-get install -y \
     patch \
     unzip \
     zlib1g-dev \
+    zip \
     --no-install-recommends && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
+RUN docker-php-ext-configure gd --with-freetype --with-jpeg
+
 RUN cp /usr/share/i18n/SUPPORTED /etc/locale.gen
 RUN locale-gen
 
-RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
-
 RUN docker-php-ext-install \
     gd \
+    bcmath \
     pcntl \
+    pdo \
+    pdo_pgsql \
     pdo_mysql \
-    zip
-
-RUN pecl channel-update pecl.php.net \
-    && printf "\n" | pecl install mcrypt-1.0.2 \
-    && printf "\n" | pecl install xdebug-2.7.2 \
-    && docker-php-ext-enable mcrypt xdebug
-
-COPY conf/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
-COPY conf/zz-docker.conf /usr/local/etc/php-fpm.d/zz-docker.conf
+    zip

php/conf/xdebug.ini

@@ -1,4 +0,0 @@
-zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20170718/xdebug.so
-xdebug.remote_connect_back=1
-xdebug.remote_enable=1
-xdebug.remote_port=9000

php/conf/zz-docker.conf

@@ -1,10 +0,0 @@
-[global]
-daemonize = no
-
-[www]
-listen = 9000
-
-pm = dynamic
-pm.max_children = 64
-pm.process_idle_timeout = 2s
-pm.max_requests = 1000