Merge pull request #641 from turbo124/debian

Updates for tar extraction

debian/Dockerfile

@@ -117,8 +117,14 @@ WORKDIR /var/www/html
 RUN set -eux; \ 
     DOWNLOAD_URL=$(curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
     grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | cut -d '"' -f 4) && \
-    curl -L "$DOWNLOAD_URL" | tar -xzf - -C /var/www/html --overwrite && \
+    echo "Downloading from: $DOWNLOAD_URL" && \
-    rm -rf /var/www/html/ui && \
+    # Download and save the tar
+    curl -L "$DOWNLOAD_URL" -o /tmp/ninja.tar && \
+    # Try extraction
+    cd /var/www/html && \
+    tar --strip-components=1 -xf /tmp/ninja.tar && \
+    # List what was extracted
+    rm -f /tmp/ninja.tar && \
     chown -R www-data:www-data /var/www/html
 
 # Install dependencies

debian/docker-compose.yml

@@ -8,7 +8,7 @@ x-logging: &default-logging
 
 services:
   app:
-    image: invoiceninja/invoiceninja-debian:5.10.55-d
+    image: invoiceninja/invoiceninja-debian:latest
     restart: unless-stopped
     env_file:
       - ./.env
@@ -35,7 +35,7 @@ services:
     image: nginx:alpine
     restart: unless-stopped
     ports:
-      - "8013:80"
+      - "80:80"
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d:ro
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
@@ -112,4 +112,4 @@ volumes:
   redis_data:
     driver: local
   public_files:  
-    driver: local
+    driver: local