changed invoiceninja directory due to inherited VOLUME from base images

moby/moby#3639
philkry · Aug 31, 2016 · ec8f0a0 · ec8f0a0
1 parent 993cd8e
commit ec8f0a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 57 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,25 +1,23 @@
 FROM webhippie/php-caddy:latest
-MAINTAINER Thomas Boerger <thomas@webhippie.de>
 
-VOLUME ["/storage", "/srv/www/vendor"]
+VOLUME ["/storage", "/opt/invoiceninja/vendor"]
 
-ENTRYPOINT ["/usr/bin/entrypoint"]
 CMD ["/bin/s6-svscan", "/etc/s6"]
 EXPOSE 8080
-WORKDIR /srv/www
-
-ENV INVOICENINJA_VERSION 2.6.10
-ENV INVOICENINJA_TARBALL https://github.com/invoiceninja/invoiceninja/archive/v${INVOICENINJA_VERSION}.tar.gz
+WORKDIR /opt/invoiceninja
 
 RUN apk update && \
   apk add \
     git \
-    php-apcu \
+    php5-apcu \
     sqlite&& \
   rm -rf \
     /var/cache/apk/*
 
+ENV INVOICENINJA_VERSION 2.6.10
+ENV INVOICENINJA_TARBALL https://github.com/invoiceninja/invoiceninja/archive/v${INVOICENINJA_VERSION}.tar.gz
+
 RUN curl -sLo - \
-  ${INVOICENINJA_TARBALL} | tar -xzf - --strip 1 -C /srv/www
+  ${INVOICENINJA_TARBALL} | tar -xzf - --strip 1 -C /opt/invoiceninja
 
 ADD rootfs /
diff --git a/rootfs/etc/templates/caddyfile.tmpl b/rootfs/etc/templates/caddyfile.tmpl
@@ -1,5 +1,5 @@
 :8080
-root /srv/www/public
+root /opt/invoiceninja/public
 
 log stdout
 errors stderr

diff --git a/rootfs/srv/www/.env b/rootfs/srv/www/.env
diff --git a/rootfs/srv/www/config/database.php b/rootfs/srv/www/config/database.php