Updates to the docker container.

Author: vekien

docker-compose.travis.yml

@@ -18,7 +18,7 @@ services:
             - "9000:9001"
         volumes:
             - ../xivapi:/var/www/xivapi:cached
-            - ./docker/logs/symfony:/var/www/symfony/var/log:cached
+            - ./docker/logs/symfony:/var/www/xivapi/var/log:cached
         links:
             - db
         extra_hosts:
@@ -31,7 +31,7 @@ services:
         links:
             - php
         volumes:
-            - ../xivapi:/var/www/symfony:cached
+            - ../xivapi:/var/www/xivapi:cached
             - ./docker/logs/nginx:/var/log/nginx:cached
     mysql:
         image: mysql
@@ -73,7 +73,7 @@ services:
         volumes:
             - ./docker/elk/logstash:/etc/logstash:cached
             - ./docker/elk/logstash/patterns:/opt/logstash/patterns:cached
-            - ./docker/logs/symfony:/var/www/symfony/var/log:cached
+            - ./docker/logs/symfony:/var/www/xivapi/var/log:cached
             - ./docker/logs/nginx:/var/log/nginx:cached
 
 volumes:

docker-compose.yml

@@ -6,12 +6,12 @@ input {
   }
   file {
     type => "symfony_dev"
-    path => "/var/www/symfony/var/log/dev.log"
+    path => "/var/www/xivapi/var/log/dev.log"
     start_position => beginning
   }
   file {
     type => "symfony_prod"
-    path => "/var/www/symfony/var/log/prod.log"
+    path => "/var/www/xivapi/var/log/prod.log"
     start_position => beginning
   }
 }
@@ -36,4 +36,4 @@ output {
     host => "localhost"
     cluster => "logstash"
   }
-}
+}

docker/elk/logstash/logstash.conf

@@ -1,6 +1,6 @@
 server {
-    server_name symfony.localhost;
-    root /var/www/symfony/public;
+    server_name xivapi.local;
+    root /var/www/xivapi/public;
 
     location / {
         try_files $uri @rewriteapp;

docker/nginx/symfony.conf

@@ -1,53 +1,63 @@
-FROM alpine:3.8
+FROM alpine:3.9
+ADD https://dl.bintray.com/php-alpine/key/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
+RUN apk --update add ca-certificates
+RUN echo "https://dl.bintray.com/php-alpine/v3.9/php-7.3" >> /etc/apk/repositories
 
+#
+# PHP Stuff
+#
+RUN apk add --update php
 RUN apk add --update \
-    php7.3-fpm \
-    php7.3-apcu \
-    php7.3-ctype \
-    php7.3-curl \
-    php7.3-dom \
-    php7.3-gd \
-    php7.3-iconv \
-    php7.3-imagick \
-    php7.3-json \
-    php7.3-intl \
-    php7.3-mcrypt \
-    php7.3-fileinfo\
-    php7.3-mbstring \
-    php7.3-opcache \
-    php7.3-openssl \
-    php7.3-pdo \
-    php7.3-pdo_mysql \
-    php7.3-mysqli \
-    php7.3-xml \
-    php7.3-zlib \
-    php7.3-phar \
-    php7.3-tokenizer \
-    php7.3-session \
-    php7.3-simplexml \
-    php7.3-xdebug \
-    php7.3-zip \
-    php7.3-dev \
-    php7.3-bcmath \
-    php7.3-tidy \
-    php7.3-sqlite \
-    php7.3-cli \
+    php-fpm \
+    php-apcu \
+    php-ctype \
+    php-curl \
+    php-dom \
+    php-gd \
+    php-iconv \
+    php-imagick \
+    php-json \
+    php-intl \
+    #php-mcrypt \
+    php-fileinfo\
+    php-mbstring \
+    php-opcache \
+    php-openssl \
+    php-pdo \
+    php-pdo_mysql \
+    php-xml \
+    php-zlib \
+    php-phar \
+    php-tokenizer \
+    php-session \
+    php-xdebug \
+    php-zip \
+    #php-dev \
+    php-bcmath \
+    php-tidy \
+    php-cli \
+    php-pear \
+    php-redis \
     make \
     curl
 
+#
+# Cache + Composer
+#
 RUN rm -rf /var/cache/apk/* && rm -rf /tmp/* && \
     curl --insecure https://getcomposer.org/composer.phar -o /usr/bin/composer && chmod +x /usr/bin/composer
 
-# https://stackoverflow.com/questions/31369867/how-to-install-php-redis-extension-using-the-official-php-docker-image-approach
-RUN pecl install redis && docker-php-ext-enable redis
-
-ADD symfony.ini /etc/php7.3/conf.d/
-ADD symfony.ini /etc/php7.3/cli/conf.d/
-ADD xdebug.ini  /etc/php7.3/conf.d/
-
+#
+# Copy config
+#
+ADD symfony.ini /etc/php7/conf.d/
+ADD symfony.ini /etc/php7/cli/conf.d/
+ADD xdebug.ini  /etc/php7/conf.d/
 ADD symfony.pool.conf /etc/php7/php-fpm.d/
-
 CMD ["php-fpm7", "-F"]
 
-WORKDIR /var/www/symfony
+#
+# Fin
+#
+WORKDIR /var/www/xivapi
 EXPOSE 9001