Skip to content

Commit

Permalink
Merge pull request #641 from turbo124/debian
Browse files Browse the repository at this point in the history
Updates for tar extraction
  • Loading branch information
turbo124 authored Nov 23, 2024
2 parents de2036a + 47b015a commit 1133000
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
10 changes: 8 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
rm -rf /var/www/html/ui && \
echo "Downloading from: $DOWNLOAD_URL" && \
# 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
Expand Down
6 changes: 3 additions & 3 deletions debian/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -112,4 +112,4 @@ volumes:
redis_data:
driver: local
public_files:
driver: local
driver: local

0 comments on commit 1133000

Please sign in to comment.