Update Dockerfile and remove entrypoint.sh, use default entrypoint of firefly with some mod

Author: ThreadR-r

Dockerfile

@@ -2,10 +2,11 @@ FROM arm32v6/alpine:latest
 
 ENV FF_VERSION 4.8.2
 
-ENV FF_APP_KEY=SomeRandomStringOf32CharsExactly
-ENV FF_APP_ENV=production
+ENV APP_ENV=local
 
-COPY entrypoint.sh /
+# See also: https://github.com/JC5/firefly-iii-base-image
+
+ENV FIREFLY_PATH=/var/www/localhost/htdocs/firefly COMPOSER_ALLOW_SUPERUSER=1
 
 RUN    apk update && apk add --no-cache  \
     php7 \
@@ -24,36 +25,48 @@ RUN    apk update && apk add --no-cache  \
     php7-pdo_mysql \
     php7-pdo_pgsql \
     php7-tokenizer \
+    php7-fileinfo \
+    php7-gd \
+    php7-simplexml \
+    php7-xml \
+    php7-ldap \
+    php7-iconv \
+    php7-dom \
     supervisor \
     gettext \
     curl \
     nginx \
     tzdata && \
-   mkdir -p /var/www/localhost/htdocs/firefly /run/nginx && \
-   curl -sSL https://github.com/firefly-iii/firefly-iii/archive/${FF_VERSION}.tar.gz | tar xz -C /var/www/localhost/htdocs/firefly --strip-components=1 && \
-   cd /var/www/localhost/htdocs/firefly && \
+   mkdir -p $FIREFLY_PATH /run/nginx && \
+   curl -sSL https://github.com/firefly-iii/firefly-iii/archive/${FF_VERSION}.tar.gz | tar xz -C $FIREFLY_PATH --strip-components=1 && \
+   cd $FIREFLY_PATH && \
    curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \
    composer install --prefer-dist --no-dev --no-scripts && \
    find /var/www/localhost/htdocs/ -type d -exec chmod 770 {} \; && \
    find /var/www/localhost/htdocs/ -type f -exec chmod 660 {} \; && \
    chown -R nginx:nobody /var/www/localhost/htdocs/ && \
-   chmod +x /entrypoint.sh
+   chmod +x $FIREFLY_PATH/.deploy/docker/entrypoint.sh
 
 
-RUN ln -s /tmp/test/.env /var/www/localhost/htdocs/firefly/.env  
-
 COPY custom.conf /etc/nginx/conf.d/default.conf
 COPY supervisord.conf /tmp/
 
-VOLUME  /tmp/test/
+WORKDIR $FIREFLY_PATH
+
+# Create volumes
+VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload
 
-WORKDIR  /var/www/localhost/htdocs/firefly
 
 EXPOSE 80
 
-ENTRYPOINT ["/entrypoint.sh"]
+RUN sed -i 's/chown -R www-data:www-data -R $FIREFLY_PATH/chown -R nginx:nobody $FIREFLY_PATH/g' ${FIREFLY_PATH}/.deploy/docker/entrypoint.sh && \
+    sed -i 's/exec apache2-foreground/\/usr\/bin\/supervisord -c \/tmp\/supervisord.conf/g' ${FIREFLY_PATH}/.deploy/docker/entrypoint.sh && \
+    sed -i 's/#!\/bin\/bash/#!\/usr\/bin\/env sh/g' ${FIREFLY_PATH}/.deploy/docker/entrypoint.sh && \
+    sed -i 's/echo \"Now in entrypoint.sh for Firefly III\"/echo \"Now in entrypoint.sh for Firefly III\" \&\& env > "${FIREFLY_PATH}"\/.env/g' ${FIREFLY_PATH}/.deploy/docker/entrypoint.sh
+
+
+ENTRYPOINT $FIREFLY_PATH/.deploy/docker/entrypoint.sh
 
 LABEL url=https://github.com/firefly-iii/firefly-iii/
 LABEL version=${FF_VERSION}
 
-CMD ["/usr/bin/supervisord", "-c /tmp/supervisord.conf"]