Merge pull request #53 from YtoTech/latexmk

Latexmk

Author: MonsieurV

.github/workflows/build-and-test.yml

@@ -26,8 +26,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install pipenv
+          python -m pip install --upgrade pip pipx
+          pipx install poetry
           make install-dev
       - name: Build Docker images
         run: make docker-build-all

.github/workflows/docker-hub-publish.yml

@@ -18,8 +18,8 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
-          pip install pipenv
+          python -m pip install --upgrade pip pipx
+          pipx install poetry
           make install-dev
       - name: Build Docker images
         run: make docker-build-all

.gitignore

@@ -114,3 +114,4 @@ examples/**/*.bcf
 examples/**/*.run.xml
 
 samples/**/*.log
+data/postgres*

CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 2025-08-06-1
+
+* Switch to TexLive 2025
+* Use `latexmk` as default runner instead of `latexrun`
+* Add PostgreSQL database in prevision of job status
+
 ## 2025-02-13-1
 
 * Fix build with XelaTeX [#43](https://github.com/YtoTech/latex-on-http/issues/43)

DEV.md

@@ -0,0 +1,9 @@
+# Dev guide
+
+## Create a migration file
+
+```sh
+docker-compose run --entrypoint /bin/bash latex -c "goose -s create <migration_name> sql"
+sudo 
+make set-permissions-migrations
+```

Dockerfile

@@ -24,11 +24,27 @@ RUN mkdir -p /app/latex-on-http
 WORKDIR /app/latex-on-http/
 
 # Copy application source code.
-COPY app.py Makefile Pipfile Pipfile.lock /app/latex-on-http/
+COPY app.py Makefile pyproject.toml poetry.lock /app/latex-on-http/
 COPY ./latexonhttp/ /app/latex-on-http/latexonhttp/
 
+# TODO curl -LsSf https://astral.sh/uv/install.sh | sh
 # Install app dependencies.
 RUN make install
 
+# Add migration tool.
+RUN apt-get update -qq && apt-get install -y \
+    curl \
+    && curl -fsSL \
+        https://raw.githubusercontent.com/pressly/goose/master/install.sh |\
+        sh \
+    && apt-get autoremove --purge -y && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN mkdir -p /app/latex-on-http/tools/migrations
+COPY ./tools/migrations/ /app/latex-on-http/tools/
+ENV GOOSE_MIGRATION_DIR /app/latex-on-http/tools/migrations
+ENV GOOSE_DRIVER postgres
+
+COPY ./tools/entrypoint.sh ./tools/
+
 EXPOSE 8080
-CMD ["make", "start"]
+ENTRYPOINT ["/bin/bash", "tools/entrypoint.sh"]
+CMD ["prod"]

Makefile

@@ -2,60 +2,41 @@
 ## Running Python app ##
 ## -------------------------------
 install:
-	pipenv install
+	poetry install
 
 start:
-	pipenv run gunicorn --workers=2 --threads=8 --bind=0.0.0.0:8080 app:app
+	poetry run gunicorn --workers=2 --threads=8 --bind=0.0.0.0:8080 app:app
 
 debug:
-	pipenv run python app.py --verbose --debug
+	poetry run python app.py --verbose --debug
 
 
 ## -------------------------------
 ## Running cache app ##
 ## -------------------------------
 start-cache:
-	pipenv run python app_cache.py
+	poetry run python app_cache.py
 
 debug-cache:
-	pipenv run python -u app_cache.py --debug
-
-
-## -------------------------------
-## Dev tools ##
-## -------------------------------
-install-dev:
-	pipenv install --dev
-
+	poetry run python -u app_cache.py --debug
 
 ## -------------------------------
 ## Docker build/images ##
 ## -------------------------------
 docker-pull-yoant-texlive-debian:
 	docker pull yoant/docker-texlive:debian
 
-docker-pull-yoant-texlive-alpine:
-	docker pull yoant/docker-texlive:alpine
-
 docker-build-tl-distrib-debian:
 	docker build -f container/tl-distrib-debian.Dockerfile -t yoant/latexonhttp-tl-distrib:debian .
 
-docker-build-tl-distrib-alpine:
-	docker build -f container/tl-distrib-alpine.Dockerfile -t yoant/latexonhttp-tl-distrib:alpine .
-
 docker-build-python-debian:
 	docker build -f container/python-debian.Dockerfile -t yoant/latexonhttp-python:debian .
 
-docker-build-python-alpine:
-	docker build -f container/python-alpine.Dockerfile -t yoant/latexonhttp-python:alpine .
-
 docker-build-main:
 	docker build -f Dockerfile .
 
 docker-build-all-debian: docker-pull-yoant-texlive-debian docker-build-tl-distrib-debian docker-build-python-debian docker-build-main
 
-docker-build-all-alpine: docker-pull-yoant-texlive-alpine docker-build-tl-distrib-alpine docker-build-python-alpine docker-build-main
-
 docker-build-all: docker-build-all-debian
 
 ## -------------------------------
@@ -72,22 +53,25 @@ docker-push-python-debian:
 ## Docker Compose for dev ##
 ## -------------------------------
 dev:
-	docker-compose -f docker-compose.dev.yml up
+	docker-compose up
 
 dev-build:
-	docker-compose -f docker-compose.dev.yml build --no-cache
+	docker-compose build --no-cache
 
 dev-sh-latex:
-	docker-compose -f docker-compose.dev.yml exec latex /bin/bash
+	docker-compose exec latex /bin/bash
+
+set-permissions-migrations:
+	chown -R $(SUDO_USER):$(SUDO_USER) ./tools/migrations
 
 ## -------------------------------
 ## Tests ##
 ## -------------------------------
 test:
-	pipenv run pytest -vv
+	poetry run pytest -vv
 
 test-x:
-	pipenv run pytest -vv -x
+	poetry run pytest -vv -x
 
 test-docker-compose: test-docker-compose-start
 	sleep 3
@@ -121,4 +105,4 @@ test-docker-compose-build-no-cache:
 ## Code conventions and formatting ##
 ## -------------------------------
 format:
-	pipenv run black .
+	poetry run black .