diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 0c75a64..37d5bb7 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,6 +1,6 @@ services: - whisper: + stirling: build: - context: ./docker/whisper/ + context: ./docker/stirling/ dockerfile: Dockerfile.production - image: git.nixc.us/nixius/whisper:production \ No newline at end of file + image: git.nixc.us/nixius/stirling:production \ No newline at end of file diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 97beb9d..099b3b4 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,6 +1,6 @@ services: - whisper: + stirling: build: - context: ./docker/whisper/ + context: ./docker/stirling/ dockerfile: Dockerfile - image: git.nixc.us/nixius/whisper:staging + image: git.nixc.us/nixius/stirling:staging diff --git a/docker/stirling/Dockerfile b/docker/stirling/Dockerfile new file mode 100644 index 0000000..2a12821 --- /dev/null +++ b/docker/stirling/Dockerfile @@ -0,0 +1,6 @@ +FROM frooodle/s-pdf:latest + +EXPOSE 8080 +ENV DOCKER_ENABLE_SECURITY=false +ENV INSTALL_BOOK_AND_ADVANCED_HTML_OPS=false +ENV LANGS=en_US \ No newline at end of file diff --git a/docker/stirling/Dockerfile.production b/docker/stirling/Dockerfile.production new file mode 100644 index 0000000..1f384e5 --- /dev/null +++ b/docker/stirling/Dockerfile.production @@ -0,0 +1 @@ +FROM git.nixc.us/nixius/stirling:staging \ No newline at end of file diff --git a/docker/whisper/Dockerfile b/docker/whisper/Dockerfile deleted file mode 100644 index e26c701..0000000 --- a/docker/whisper/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# Use an official Node runtime as a parent image -FROM node:20-alpine - -# Set the working directory -WORKDIR /usr/src/app - -# Clone the repo -RUN apk --no-cache add git \ - && git clone https://github.com/xenova/whisper-web.git . - -# Install dependencies -RUN npm install - -# Expose the port the app runs on -EXPOSE 5173 - -# Command to run the app -CMD ["npm", "run", "dev", "--", "--host", "0.0.0.0"] diff --git a/docker/whisper/Dockerfile.production b/docker/whisper/Dockerfile.production deleted file mode 100644 index 5892f6e..0000000 --- a/docker/whisper/Dockerfile.production +++ /dev/null @@ -1 +0,0 @@ -FROM git.nixc.us/nixius/whisper:staging \ No newline at end of file diff --git a/stack.production.yml b/stack.production.yml index b388764..c737b8d 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -4,29 +4,34 @@ networks: default: driver: overlay services: - whisper: - image: git.nixc.us/nixius/whisper:production + stirling: + image: git.nixc.us/nixius/stirling:production networks: - traefik + volumes: + - /mnt/tank/persist/nixc.us/stirling/production/trainingData:/usr/share/tessdata #Required for extra OCR languages + - /mnt/tank/persist/nixc.us/stirling/production/extraConfigs:/configs + - /mnt/tank/persist/nixc.us/stirling/production/customFiles:/customFiles/ + - /mnt/tank/persist/nixc.us/stirling/production/logs:/logs/ deploy: placement: constraints: - node.hostname == macmini14 labels: homepage.group: apps - homepage.name: whisper - homepage.href: https://whisper.nixc.us/ - homepage.description: whisper + homepage.name: stirling + homepage.href: https://stirling.nixc.us/ + homepage.description: stirling traefik.enable: "true" - traefik.http.routers.production-whisper_whisper.rule: "Host(`whisper.nixc.us`)" - traefik.http.routers.production-whisper_whisper.entrypoints: "websecure" - traefik.http.routers.production-whisper_whisper.tls: "true" - traefik.http.routers.production-whisper_whisper.tls.certresolver: "letsencryptresolver" - traefik.http.routers.production-whisper_whisper.service: "production-whisper_whisper" - traefik.http.services.production-whisper_whisper.loadbalancer.server.port: "5173" + traefik.http.routers.production-stirling_stirling.rule: "Host(`stirling.nixc.us`)" + traefik.http.routers.production-stirling_stirling.entrypoints: "websecure" + traefik.http.routers.production-stirling_stirling.tls: "true" + traefik.http.routers.production-stirling_stirling.tls.certresolver: "letsencryptresolver" + traefik.http.routers.production-stirling_stirling.service: "production-stirling_stirling" + traefik.http.services.production-stirling_stirling.loadbalancer.server.port: "8080" traefik.docker.network: "traefik" - # traefik.http.routers.production_whisper.middlewares: 'authelia_authelia@docker' - traefik.http.routers.production-whisper_whisper.middlewares: 'authelia_authelia@docker' + # traefik.http.routers.production_stirling.middlewares: 'authelia_authelia@docker' + traefik.http.routers.production-stirling_stirling.middlewares: 'authelia_authelia@docker' update_config: order: stop-first failure_action: rollback diff --git a/stack.staging.yml b/stack.staging.yml index c71f3b2..9f72881 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -2,8 +2,8 @@ networks: traefik: external: true services: - whisper: - image: git.nixc.us/nixius/whisper:staging + stirling: + image: git.nixc.us/nixius/stirling:staging networks: - traefik deploy: