diff --git a/docker-compose.production.yml b/docker-compose.production.yml index 37d5bb7..7e06b6d 100644 --- a/docker-compose.production.yml +++ b/docker-compose.production.yml @@ -1,6 +1,6 @@ services: - stirling: + ferdium: build: - context: ./docker/stirling/ + context: ./docker/ferdium/ dockerfile: Dockerfile.production - image: git.nixc.us/nixius/stirling:production \ No newline at end of file + image: git.nixc.us/nixius/ferdium:production \ No newline at end of file diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 099b3b4..509b527 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -1,6 +1,6 @@ services: - stirling: + ferdium: build: - context: ./docker/stirling/ + context: ./docker/ferdium/ dockerfile: Dockerfile - image: git.nixc.us/nixius/stirling:staging + image: git.nixc.us/nixius/ferdium:staging diff --git a/docker/stirling/Dockerfile b/docker/stirling/Dockerfile index a99b14a..25c54d8 100644 --- a/docker/stirling/Dockerfile +++ b/docker/stirling/Dockerfile @@ -1,7 +1 @@ -FROM scratch -# 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 +FROM ferdium/ferdium-server:latest \ No newline at end of file diff --git a/docker/stirling/Dockerfile.production b/docker/stirling/Dockerfile.production index 1f384e5..4b61da2 100644 --- a/docker/stirling/Dockerfile.production +++ b/docker/stirling/Dockerfile.production @@ -1 +1 @@ -FROM git.nixc.us/nixius/stirling:staging \ No newline at end of file +FROM git.nixc.us/nixius/ferdium:staging \ No newline at end of file diff --git a/stack.production.yml b/stack.production.yml index e597742..9cd2fd7 100644 --- a/stack.production.yml +++ b/stack.production.yml @@ -4,34 +4,57 @@ networks: default: driver: overlay services: - stirling: - image: frooodle/s-pdf:latest + ferdium: + image: git.nixc.us/nixius/ferdium:production networks: - traefik + environment: + NODE_ENV: production + APP_URL: ferdium.nixc.us + DB_CONNECTION: sqlite + # Uncomment the lines below to use MySQL instead of SQLite + # DB_CONNECTION: mysql + # DB_HOST: + # DB_PORT: 3306 + # DB_USER: + # DB_PASSWORD: + # DB_DATABASE: ferdium + DB_SSL: "false" + MAIL_CONNECTION: smtp + SMTP_HOST: box.p.nixc.us + SMTP_PORT: 465 + MAIL_SSL: "true" + MAIL_USERNAME: ferdium@nixc.us + MAIL_PASSWORD: dzUAQp3ZmjLN2tMq5XDoS6J29EdFqjntF + MAIL_SENDER: ferdium@nixc.us + IS_CREATION_ENABLED: "true" + IS_DASHBOARD_ENABLED: "true" + IS_REGISTRATION_ENABLED: "true" + CONNECT_WITH_FRANZ: "false" + DATA_DIR: /data + JWT_USE_PEM: "true" 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/ + - /mnt/tank/persist/nixc.us/ferdium/production/data:/data + - /mnt/tank/persist/nixc.us/ferdium/production/recipes:/app/build/recipes deploy: placement: constraints: - node.hostname == macmini14 labels: homepage.group: apps - homepage.name: stirling - homepage.href: https://stirling.nixc.us/ - homepage.description: stirling + homepage.name: ferdium + homepage.href: https://ferdium.nixc.us/ + homepage.description: ferdium traefik.enable: "true" - 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.http.routers.production-ferdium_ferdium.rule: "Host(`ferdium.nixc.us`)" + traefik.http.routers.production-ferdium_ferdium.entrypoints: "websecure" + traefik.http.routers.production-ferdium_ferdium.tls: "true" + traefik.http.routers.production-ferdium_ferdium.tls.certresolver: "letsencryptresolver" + traefik.http.routers.production-ferdium_ferdium.service: "production-ferdium_ferdium" + traefik.http.services.production-ferdium_ferdium.loadbalancer.server.port: "3333" traefik.docker.network: "traefik" - # traefik.http.routers.production_stirling.middlewares: 'authelia_authelia@docker' - traefik.http.routers.production-stirling_stirling.middlewares: 'authelia_authelia@docker' + # traefik.http.routers.production_ferdium.middlewares: 'authelia_authelia@docker' + traefik.http.routers.production-ferdium_ferdium.middlewares: 'authelia_authelia@docker' update_config: order: stop-first failure_action: rollback diff --git a/stack.staging.yml b/stack.staging.yml index f5729dd..76307f6 100644 --- a/stack.staging.yml +++ b/stack.staging.yml @@ -1,17 +1,35 @@ networks: traefik: external: true + default: + driver: overlay services: - stirling: - image: frooodle/s-pdf:latest + ferdium: + image: git.nixc.us/nixius/ferdium:staging networks: - traefik + # volumes: + # - /mnt/tank/persist/nixc.us/ferdium/staging/data:/data + # - /mnt/tank/persist/nixc.us/ferdium/staging/recipes:/app/build/recipes deploy: placement: constraints: - node.hostname == macmini14 labels: - traefik.enable: "false" + homepage.group: apps + homepage.name: ferdium + homepage.href: https://ferdium.nixc.us/ + homepage.description: ferdium + traefik.enable: "true" + traefik.http.routers.staging-ferdium_ferdium.rule: "Host(`ferdium.nixc.us`)" + traefik.http.routers.staging-ferdium_ferdium.entrypoints: "websecure" + traefik.http.routers.staging-ferdium_ferdium.tls: "true" + traefik.http.routers.staging-ferdium_ferdium.tls.certresolver: "letsencryptresolver" + traefik.http.routers.staging-ferdium_ferdium.service: "staging-ferdium_ferdium" + traefik.http.services.staging-ferdium_ferdium.loadbalancer.server.port: "3333" + traefik.docker.network: "traefik" + # traefik.http.routers.staging_ferdium.middlewares: 'authelia_authelia@docker' + traefik.http.routers.staging-ferdium_ferdium.middlewares: 'authelia_authelia@docker' update_config: order: stop-first failure_action: rollback