Added recommended extensions to dev container

.devcontainer/Dockerfile.dev

@@ -0,0 +1,65 @@
+# Main stage
+FROM alpine:edge
+
+LABEL org.opencontainers.image.title="Stirling-PDF"
+LABEL org.opencontainers.image.description="A powerful locally hosted web-based PDF manipulation tool supporting 50+ operations including merging, splitting, conversion, OCR, watermarking, and more."
+LABEL org.opencontainers.image.source="https://github.com/Stirling-Tools/Stirling-PDF"
+LABEL org.opencontainers.image.licenses="MIT"
+LABEL org.opencontainers.image.vendor="Stirling-Tools"
+LABEL org.opencontainers.image.url="https://www.stirlingpdf.com"
+LABEL org.opencontainers.image.documentation="https://docs.stirlingpdf.com"
+LABEL maintainer="Stirling-Tools"
+LABEL org.opencontainers.image.authors="Stirling-Tools"
+LABEL org.opencontainers.image.keywords="PDF, manipulation, merge, split, convert, OCR, watermark"
+
+# Set Environment Variables
+ENV DOCKER_ENABLE_SECURITY=false \
+        JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
+        -XX:MaxRAMPercentage=75 \
+        -XX:InitiatingHeapOccupancyPercent=20 \
+        -XX:+G1PeriodicGCInvokesConcurrent \
+        -XX:G1PeriodicGCInterval=10000 \
+        -XX:+UseStringDeduplication \
+        -XX:G1PeriodicGCSystemLoadThreshold=70" \
+        HOME=/home/stirlingpdfuser \
+        PUID=1000 \
+        PGID=1000 \
+        UMASK=022
+
+
+# JDK for app
+RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
+        echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
+        echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories
+RUN apk upgrade  -a
+RUN apk add ca-certificates
+RUN apk add tzdata
+RUN apk add tini
+RUN apk add bash
+RUN apk add curl
+RUN apk add git
+
+RUN apk add qpdf
+RUN apk add shadow
+RUN apk add su-exec
+RUN apk add openssl
+RUN apk add openssl-dev
+RUN apk add openjdk21
+# Doc conversion
+RUN apk add libreoffice
+# pdftohtml
+RUN apk add poppler-utils
+# OCR MY PDF (unpaper for descew and other advanced features)
+RUN apk add tesseract-ocr-data-eng
+# python3/pip
+
+RUN apk add python3
+RUN apk add py3-pip
+RUN apk add py3-opencv
+RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-unoconv
+RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-pdf2image
+RUN apk add -X https://dl-cdn.alpinelinux.org/alpine/edge/testing py3-pillow
+
+RUN pip install --break-system-packages --upgrade WeasyPrint
+
+EXPOSE 8080/tcp

.devcontainer/devcontainer.json

@@ -0,0 +1,49 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
+{
+	"name": "Existing Dockerfile",
+	"build": {
+		// Sets the run context to one level up instead of the .devcontainer folder.
+		"context": "..",
+		// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
+		"dockerfile": "./Dockerfile.dev"
+	},
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	"forwardPorts": [
+		8080
+	],
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "cat /etc/os-release",
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"elagil.pre-commit-helper", // Support for pre-commit hooks to enforce code quality
+				"josevseb.google-java-format-for-vs-code", // Google Java code formatter to follow the Google Java Style Guide
+				"ms-python.black-formatter", // Python code formatter using Black
+				"ms-python.flake8", // Flake8 linter for Python to enforce code quality
+				"ms-python.python", // Official Microsoft Python extension with IntelliSense, debugging, and Jupyter support
+				// "ms-vscode-remote.remote-containers", // Support for remote development with containers (Docker, Dev Containers)
+				// "ms-vscode-remote.vscode-remote-extensionpack", // Remote Development Pack for SSH, WSL, and Containers
+				"Oracle.oracle-java", // Oracle Java extension with additional features for Java development
+				"redhat.java", // Java support by Red Hat with IntelliSense, debugging, and code navigation
+				"shengchen.vscode-checkstyle", // Checkstyle integration for Java code quality checks
+				"streetsidesoftware.code-spell-checker", // Spell checker for code to avoid typos
+				"vmware.vscode-boot-dev-pack", // Developer tools for Spring Boot by VMware
+				"vmware.vscode-spring-boot", // Spring Boot tools by VMware for enhanced Spring development
+				"vscjava.vscode-gradle", // Gradle extension for build and automation support
+				"vscjava.vscode-java-debug", // Debugging support for Java projects
+				"vscjava.vscode-java-dependency", // Java dependency management within VS Code
+				"vscjava.vscode-java-pack", // Java Extension Pack with essential Java tools for VS Code
+				"vscjava.vscode-java-test", // Java test framework for running and debugging tests in VS Code
+				"vscjava.vscode-spring-boot-dashboard", // Spring Boot dashboard for managing and visualizing Spring Boot applications
+				"vscjava.vscode-spring-initializr", // Support for Spring Initializr to create new Spring projects
+				"ms-azuretools.vscode-docker" // build, manage, and deploy containerized applications from Visual Studio Code
+			]
+		}
+	}
+	// Uncomment to connect as an existing user other than the container default. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "devcontainer"
+}

.do/deploy.template.yaml

@@ -1,29 +0,0 @@
-spec:
-  name: stirling-pdf
-  services:
-    - name: stirling-pdf
-      git:
-        branch: digitalOcean
-        repo_clone_url: https://github.com/Stirling-Tools/Stirling-PDF.git
-      dockerfile_path: Dockerfile2
-      envs:
-        - key: APP_HOME_NAME
-          value: "Stirling PDF"
-        - key: APP_HOME_DESCRIPTION
-          value: "Your locally hosted one-stop-shop for all your PDF needs."
-        - key: APP_NAVBAR_NAME
-          value: "Stirling PDF"
-        - key: ALLOW_GOOGLE_VISIBILITY
-          value: "false"
-        - key: APP_ROOT_PATH
-          value: "/"
-        - key: APP_LOCALE
-          value: "en_GB"
-        - key: TESSERACT_LANGS
-          value: "eng"   
-      routes:
-        - path: /
-      http_port: 8080
-      instance_count: 1
-      instance_size_slug: basic-xxs
-      source_dir: "/"

Dockerfile2

@@ -1,108 +0,0 @@
-# Intermediate stage for running dos2unix
-FROM alpine:3.14 AS dos2unix-converter
-
-# Install dos2unix
-RUN apk add --no-cache dos2unix
-
-# Copy script files
-COPY ./scripts/* /dos2unix-scripts/
-
-# Convert line endings
-RUN dos2unix /dos2unix-scripts/*
-
-
-
-# Build stage
-FROM alpine:3.14 AS downloader
-
-# Install necessary utilities
-RUN apk add --no-cache curl jq 
-
-# Set work directory
-WORKDIR /downloader
-
-# Fetch the latest release jar from GitHub
-RUN curl -s https://api.github.com/repos/Stirling-Tools/Stirling-PDF/releases/latest \
-    | jq -r ".assets[] | select(.name == \"Stirling-PDF.jar\") | .browser_download_url" \
-    | xargs curl -L -o Stirling-PDF.jar
-
-
-# Main stage
-FROM alpine:3.21.2@sha256:56fa17d2a7e7f168a043a2712e63aed1f8543aeafdcee47c58dcffe38ed51099
-
-# Copy necessary files
-COPY scripts /scripts
-COPY pipeline /pipeline
-COPY src/main/resources/static/fonts/*.ttf /usr/share/fonts/opentype/noto/
-
-# Copy the application JAR file from the download stage
-COPY --from=downloader /downloader/Stirling-PDF.jar /app.jar
-
-ARG VERSION_TAG
-
-# Set Environment Variables
-ENV DOCKER_ENABLE_SECURITY=false \
-    VERSION_TAG=$VERSION_TAG \
-    JAVA_TOOL_OPTIONS="-XX:+UnlockExperimentalVMOptions \
-    -XX:MaxRAMPercentage=75 \
-    -XX:InitiatingHeapOccupancyPercent=20 \
-    -XX:+G1PeriodicGCInvokesConcurrent \
-    -XX:G1PeriodicGCInterval=10000 \
-    -XX:+UseStringDeduplication \
-    -XX:G1PeriodicGCSystemLoadThreshold=70" \
-    HOME=/home/stirlingpdfuser \
-    PUID=1000 \
-    PGID=1000 \
-    UMASK=022 \
-    FAT_DOCKER=true \
-    INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false
-
-
-# JDK for app
-RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/community" | tee -a /etc/apk/repositories && \
-    echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" | tee -a /etc/apk/repositories && \
-    apk upgrade --no-cache -a && \
-    apk add --no-cache \
-        ca-certificates \
-        tzdata \
-        tini \
-        bash \
-        curl \
-        shadow \
-        su-exec \
-        openssl \
-        openssl-dev \
-        openjdk21-jre \
-# Doc conversion
-		gcompat \
-    	libc6-compat \
-        libreoffice \
-# pdftohtml
-        poppler-utils \
-# OCR MY PDF (unpaper for descew and other advanced featues)
-        qpdf \
-        tesseract-ocr-data-eng \
-        font-terminus font-dejavu font-noto font-noto-cjk font-awesome font-noto-extra \
-# CV
-# py3-opencv \
-# python3/pip
-        python3 \
-    py3-pip && \
-# uno unoconv and HTML
-    pip install --break-system-packages --no-cache-dir --upgrade unoconv WeasyPrint pdf2image pillow && \
-    mv /usr/share/tessdata /usr/share/tessdata-original && \
-    mkdir -p $HOME /configs /logs /customFiles /pipeline/watchedFolders /pipeline/finishedFolders && \
-    fc-cache -f -v && \
-    chmod +x /scripts/* && \
-    chmod +x /scripts/init.sh && \
-# User permissions
-    addgroup -S stirlingpdfgroup && adduser -S stirlingpdfuser -G stirlingpdfgroup && \
-    chown -R stirlingpdfuser:stirlingpdfgroup $HOME /scripts /usr/share/fonts/opentype/noto /configs /customFiles /pipeline && \
-    chown stirlingpdfuser:stirlingpdfgroup /app.jar
-
-EXPOSE 8080/tcp
-
-# Set user and run command
-ENTRYPOINT ["tini", "--", "/scripts/init.sh"]
-CMD ["java", "-Dfile.encoding=UTF-8", "-jar", "/app.jar"]