updated with slim build (#694)

Author: gtsteffaniak

.github/workflows/pr.yaml

@@ -104,7 +104,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./_docker/Dockerfile
+          file: ./_docker/Dockerfile.slim
           push: false # Do not push the image for now
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release_dev.yaml

@@ -56,7 +56,7 @@ jobs:
             VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
             REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
           platforms: linux/amd64,linux/arm64
-          file: ./_docker/Dockerfile
+          file: ./_docker/Dockerfile.slim
           push: true
           tags: ${{ steps.modify-json.outputs.cleaned_tag }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/release_docker.yaml

@@ -96,3 +96,70 @@ jobs:
           push: true
           tags: ${{ steps.modify-json.outputs.cleaned_tag }}
           labels: ${{ steps.meta.outputs.labels }}
+
+  push_slim_release_to_registry:
+    name: Push slim release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/[email protected]
+      - name: Set up Docker Buildx
+        uses: docker/[email protected]
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{github.actor}}
+          password: ${{ secrets.PAT }}
+      - name: Extract metadata (tags, labels) for Docker and GHCR
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            gtstef/filebrowser
+            ghcr.io/gtsteffaniak/filebrowser
+      - name: Modify tags (strip 'v' and add 'beta'/'stable' if needed)
+        id: modify-json
+        run: |
+          JSON='${{ steps.meta.outputs.json }}'
+          MODIFIED_JSON=$(echo "$JSON" | jq '
+            .tags |= map(sub(":v"; ":")) |
+            if any(.tags[]; test("beta")) then
+              .tags += [
+                "gtstef/filebrowser:beta-slim",
+                "ghcr.io/gtsteffaniak/filebrowser:beta-slim",
+                "gtstef/filebrowser:slim",
+                "ghcr.io/gtsteffaniak/filebrowser:slim"
+              ]
+            else . end |
+            if any(.tags[]; test("stable")) then
+              .tags += [
+                "gtstef/filebrowser:stable-slim",
+                "ghcr.io/gtsteffaniak/filebrowser:stable-slim",
+                "gtstef/filebrowser:slim",
+                "ghcr.io/gtsteffaniak/filebrowser:slim"
+              ]
+            else . end
+          ')
+          TAGS_CSV=$(echo "$MODIFIED_JSON" | jq -r '.tags | join(",")')
+          echo "$TAGS_CSV" > modified_tags.txt  # Optional debug output
+          echo "cleaned_tag=$TAGS_CSV" >> $GITHUB_OUTPUT
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          build-args: |
+            VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }}
+            REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }}
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          file: ./_docker/Dockerfile.slim
+          push: true
+          tags: ${{ steps.modify-json.outputs.cleaned_tag }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/tag.yaml

@@ -4,12 +4,32 @@ All notable changes to this project will be documented in this file. For commit
 
 ## v0.7.6-beta
 
+NOTE: if using docker arm32 image, you will need to switch to the slim images. The regular docker images are much larger now and support generating office previews out of the box without any only office running. However, they don't support arm32. Also, be aware the docker images are much larger now (600MB I believe) because of the office document preview support -- if thats not something you care about you can switch to the slim images.
+
  **New Features**:
- - pdf previews always enabled for docker images (no office integration needed)
+ - native document preview generation enabled for certain document types on the regular docker image (no office integration needed)
+   - supported native document preview types:
+     - ".pdf",  // PDF
+     - ".xps",  // XPS
+     - ".epub", // EPUB
+     - ".mobi", // MOBI
+     - ".fb2",  // FB2
+     - ".cbz",  // CBZ
+     - ".svg",  // SVG
+     - ".txt",  // TXT
+     - ".doc",  // DOC
+     - ".docx", // DOCX
+     - ".ppt",  // PPT
+     - ".pptx", // PPTX
+     - ".xls",  // excel xls
+     - ".xlsx", // exel XLSX
+     - ".hwp",  // HWP
+     - ".hwp",  // HWPX
  - proxy logout redirectUrl support via `auth.methods.proxy.logoutRedirectUrl` https://github.com/gtsteffaniak/filebrowser/issues/684
 
  **Notes**:
  - image loading placeholders added and remain if image can't be loaded.
+ - no more arm32 support on main image -- use a `slim` tagged image.
 
  **BugFixes**:
  - onlyoffice and other cache issues https://github.com/gtsteffaniak/filebrowser/issues/686

CHANGELOG.md

@@ -22,7 +22,7 @@ FROM alpine:latest
 COPY --from=ffmpeg [ "/ffmpeg", "/ffprobe", "/usr/local/bin/" ]
 # requirements to enable pdf support
 RUN apk add --no-cache libffi mupdf && \
-    find / -name "libmupdf.so*" -exec sh -c 'mv "$0" "$(dirname "$0")/libmupdf.so"' {} \;
+    find / -name "libmupdf.so*" -type f -exec mv {} /usr/lib/libmupdf.so \;
 
 ENV FILEBROWSER_FFMPEG_PATH="/usr/local/bin/"
 ENV FILEBROWSER_NO_EMBEDED="true"

_docker/Dockerfile

@@ -5,7 +5,7 @@ WORKDIR /app
 COPY ./backend ./
 #RUN swag init --output swagger/docs
 RUN ln -s swagger /usr/local/go/src/
-RUN go build -tags pdf -ldflags="-w -s \
+RUN go build -ldflags="-w -s \
   -X 'github.com/gtsteffaniak/filebrowser/backend/common/version.Version=${VERSION}' \
   -X 'github.com/gtsteffaniak/filebrowser/backend/common/version.CommitSHA=${REVISION}'" \
   -o filebrowser .
@@ -36,10 +36,6 @@ RUN apk add --no-cache curl xz && \
     apk del curl xz && \
     rm -rf /var/cache/apk/*
 
-# requirements to enable pdf support
-RUN apk add --no-cache libffi mupdf && \
-    find / -name "libmupdf.so*" -exec sh -c 'mv "$0" "$(dirname "$0")/libmupdf.so"' {} \;
-
 ENV FILEBROWSER_FFMPEG_PATH="/usr/local/bin/"
 ENV FILEBROWSER_NO_EMBEDED="true"
 ENV PATH="$PATH:/home/filebrowser"

_docker/Dockerfile.armv7 renamed to _docker/Dockerfile.slim

@@ -21,7 +21,7 @@ type Settings struct {
 }
 
 type Server struct {
-	NumImageProcessors           int         `json:"numImageProcessors"`           // number of concurrent image processing jobs used to create previews, default is 4,
+	NumImageProcessors           int         `json:"numImageProcessors"`           // number of concurrent image processing jobs used to create previews, default is number of cpu cores available.
 	Socket                       string      `json:"socket"`                       // socket to listen on
 	TLSKey                       string      `json:"tlsKey"`                       // path to TLS key
 	TLSCert                      string      `json:"tlsCert"`                      // path to TLS cert

backend/common/settings/structs.go

@@ -20,6 +20,25 @@ var AllFiletypeOptions = []string{
 	"text",
 }
 
+var PdfConvertable = []string{
+	".pdf",  // PDF
+	".xps",  // XPS
+	".epub", // EPUB
+	".mobi", // MOBI
+	".fb2",  // FB2
+	".cbz",  // CBZ
+	".svg",  // SVG
+	".txt",  // TXT
+	".doc",  // DOC
+	".docx", // DOCX
+	".ppt",  // PPT
+	".pptx", // PPTX
+	".xls",  // XLS
+	".xlsx", // XLSX
+	".hwp",  // HWP
+	".hwp",  // HWPX
+}
+
 // Known bundle-style extensions that are technically directories but treated as files
 var BundleExtensions = []string{
 	".app",       // macOS application bundle
@@ -355,3 +374,16 @@ func hasBundleExtension(name string) bool {
 	}
 	return false
 }
+
+func HasDocConvertableExtension(name string) bool {
+	if !settings.Config.Server.PdfAvailable {
+		return false
+	}
+	ext := strings.ToLower(filepath.Ext(name))
+	for _, e := range PdfConvertable {
+		if ext == e {
+			return true
+		}
+	}
+	return false
+}

backend/indexing/iteminfo/conditions.go

@@ -12,24 +12,24 @@ import (
 	"github.com/gen2brain/go-fitz"
 )
 
-func pdfEnabled() bool {
+func docEnabled() bool {
 	// This function checks if the PDF support is enabled.
 	// In a real implementation, this might check a build tag or configuration.
 	return true
 }
 
-func (s *Service) GenerateImageFromPDF(pdfPath string, pageNumber int) ([]byte, error) {
+func (s *Service) GenerateImageFromDoc(docPath string, pageNumber int) ([]byte, error) {
 	if err := s.acquire(context.Background()); err != nil {
 		return nil, err
 	}
 	defer s.release()
-	doc, err := fitz.New(pdfPath)
+	doc, err := fitz.New(docPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open PDF: %w", err)
 	}
 	defer doc.Close()
 
-	// Get the image from the PDF page
+	// Get the image from the doc page
 	img, err := doc.Image(pageNumber) // Assuming page numbers are 0-indexed as per go-fitz common usage
 	if err != nil {
 		return nil, fmt.Errorf("failed to get image from page %d: %w", pageNumber, err)