Compare commits
No commits in common. "e5e1a2bfc1cff4c8d09a907efcd4a9f5b91df02c" and "a37db15a3f388e527056417913efa43cd25d07ad" have entirely different histories.
e5e1a2bfc1
...
a37db15a3f
6 changed files with 1 additions and 129 deletions
|
|
@ -1,16 +0,0 @@
|
||||||
node_modules
|
|
||||||
tools/venv
|
|
||||||
uploads
|
|
||||||
thumbnails
|
|
||||||
glb
|
|
||||||
data
|
|
||||||
.git
|
|
||||||
.gitignore
|
|
||||||
.forgejo
|
|
||||||
.env
|
|
||||||
*.log
|
|
||||||
.DS_Store
|
|
||||||
npm-debug.log*
|
|
||||||
Dockerfile
|
|
||||||
.dockerignore
|
|
||||||
docker-compose.yml
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
name: build-and-push
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches: [main]
|
|
||||||
tags: ['v*']
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
packages: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
docker:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Log in to the Forgejo container registry
|
|
||||||
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login git.plexultra.com -u "${{ github.actor }}" --password-stdin
|
|
||||||
|
|
||||||
- name: Build and push image
|
|
||||||
run: |
|
|
||||||
IMAGE="git.plexultra.com/${{ github.repository }}"
|
|
||||||
SHA="${{ github.sha }}"
|
|
||||||
docker build -t "$IMAGE:latest" -t "$IMAGE:${SHA:0:12}" .
|
|
||||||
docker push "$IMAGE:latest"
|
|
||||||
docker push "$IMAGE:${SHA:0:12}"
|
|
||||||
30
Dockerfile
30
Dockerfile
|
|
@ -1,30 +0,0 @@
|
||||||
# Printhive — Node app + Python/trimesh sidecar (for 3MF -> GLB conversion)
|
|
||||||
FROM node:22-bookworm-slim
|
|
||||||
|
|
||||||
# Python is needed at runtime for the 3MF->GLB / volume sidecar.
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y --no-install-recommends python3 python3-venv \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
WORKDIR /app
|
|
||||||
|
|
||||||
# Tell the converter where Python lives (the venv built below).
|
|
||||||
ENV PYTHON_BIN=/app/tools/venv/bin/python
|
|
||||||
|
|
||||||
# Python sidecar deps (cached unless requirements.txt changes).
|
|
||||||
COPY tools/requirements.txt ./tools/requirements.txt
|
|
||||||
RUN python3 -m venv /app/tools/venv \
|
|
||||||
&& /app/tools/venv/bin/pip install --no-cache-dir -r tools/requirements.txt
|
|
||||||
|
|
||||||
# Node deps (cached unless package files change).
|
|
||||||
COPY package.json package-lock.json ./
|
|
||||||
RUN npm ci --omit=dev
|
|
||||||
|
|
||||||
# App source.
|
|
||||||
COPY . .
|
|
||||||
|
|
||||||
ENV NODE_ENV=production \
|
|
||||||
PORT=3000
|
|
||||||
EXPOSE 3000
|
|
||||||
|
|
||||||
CMD ["node", "server.js"]
|
|
||||||
|
|
@ -1,50 +0,0 @@
|
||||||
services:
|
|
||||||
db:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
environment:
|
|
||||||
POSTGRES_USER: printhive
|
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-printhive}
|
|
||||||
POSTGRES_DB: printhive
|
|
||||||
volumes:
|
|
||||||
- pgdata:/var/lib/postgresql/data
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U printhive -d printhive"]
|
|
||||||
interval: 5s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
restart: unless-stopped
|
|
||||||
|
|
||||||
app:
|
|
||||||
build: .
|
|
||||||
image: git.plexultra.com/dlawler489/printhive:latest
|
|
||||||
depends_on:
|
|
||||||
db:
|
|
||||||
condition: service_healthy
|
|
||||||
environment:
|
|
||||||
DATABASE_URL: postgres://printhive:${POSTGRES_PASSWORD:-printhive}@db:5432/printhive
|
|
||||||
PORT: 3000
|
|
||||||
# Optional — these can also be set in the app's Settings menu (stored in the DB).
|
|
||||||
THINGIVERSE_TOKEN: ${THINGIVERSE_TOKEN:-}
|
|
||||||
FLARESOLVERR_URL: ${FLARESOLVERR_URL:-}
|
|
||||||
MAKERWORLD_TOKEN: ${MAKERWORLD_TOKEN:-}
|
|
||||||
PRINTABLES_TOKEN: ${PRINTABLES_TOKEN:-}
|
|
||||||
volumes:
|
|
||||||
- uploads:/app/uploads
|
|
||||||
- thumbnails:/app/thumbnails
|
|
||||||
- glb:/app/glb
|
|
||||||
ports:
|
|
||||||
- "3000:3000"
|
|
||||||
restart: unless-stopped
|
|
||||||
# Traefik (if using labels rather than your file provider):
|
|
||||||
# labels:
|
|
||||||
# - "traefik.enable=true"
|
|
||||||
# - "traefik.http.routers.printhive.rule=Host(`printhive.plexultra.com`)"
|
|
||||||
# - "traefik.http.routers.printhive.entrypoints=websecure"
|
|
||||||
# - "traefik.http.routers.printhive.tls.certresolver=letsencrypt"
|
|
||||||
# - "traefik.http.services.printhive.loadbalancer.server.port=3000"
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
pgdata:
|
|
||||||
uploads:
|
|
||||||
thumbnails:
|
|
||||||
glb:
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const { execFile } = require('child_process');
|
const { execFile } = require('child_process');
|
||||||
|
|
||||||
const PYTHON = process.env.PYTHON_BIN || path.join(__dirname, '..', 'tools', 'venv', 'bin', 'python');
|
const PYTHON = path.join(__dirname, '..', 'tools', 'venv', 'bin', 'python');
|
||||||
const SCRIPT = path.join(__dirname, '..', 'tools', 'convert_3mf.py');
|
const SCRIPT = path.join(__dirname, '..', 'tools', 'convert_3mf.py');
|
||||||
|
|
||||||
// Returns { glb, volume_cm3, bbox, faces } or throws.
|
// Returns { glb, volume_cm3, bbox, faces } or throws.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
trimesh
|
|
||||||
numpy
|
|
||||||
networkx
|
|
||||||
lxml
|
|
||||||
Loading…
Reference in a new issue