Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ results
site

deploy/compose/cache
deploy/compose/presentation
deploy/compose/source-cache

fixtures/benchmark
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG \
# renovate: datasource=repology depName=debian_13/ca-certificates
CA_CERTIFICATES_VERSION=20250419 \
# renovate: datasource=repology depName=debian_13/curl
CURL_VERSION=8.14.1-2+deb13u3 \
CURL_VERSION=8.14.1-2+deb13u4 \
# renovate: datasource=repology depName=debian_13/libcgif-dev
LIBCGIF_DEV_VERSION=0.5.0-1 \
# renovate: datasource=repology depName=debian_13/libexpat1-dev
Expand All @@ -34,7 +34,7 @@ ARG \
# renovate: datasource=repology depName=debian_13/libspng-dev
LIBSPNG_DEV_VERSION=0.7.4-2 \
# renovate: datasource=repology depName=debian_13/libtiff-dev
LIBTIFF_DEV_VERSION=4.7.0-3+deb13u2 \
LIBTIFF_DEV_VERSION=4.7.0-3+deb13u3 \
# renovate: datasource=repology depName=debian_13/libwebp-dev
LIBWEBP_DEV_VERSION=1.5.0-0.1 \
# renovate: datasource=repology depName=debian_13/meson
Expand Down Expand Up @@ -170,13 +170,13 @@ ARG \
# renovate: datasource=repology depName=debian_13/liblcms2-2
LIBLCMS2_2_VERSION=2.16-2+deb13u2 \
# renovate: datasource=repology depName=debian_13/libopenjp2-7
LIBOPENJP2_7_VERSION=2.5.3-2.1~deb13u1 \
LIBOPENJP2_7_VERSION=2.5.3-2.1~deb13u2 \
# renovate: datasource=repology depName=debian_13/libpng16-16t64
LIBPNG16_16T64_VERSION=1.6.48-1+deb13u5 \
# renovate: datasource=repology depName=debian_13/libspng0
LIBSPNG0_VERSION=0.7.4-2 \
# renovate: datasource=repology depName=debian_13/libtiff6
LIBTIFF6_VERSION=4.7.0-3+deb13u2 \
LIBTIFF6_VERSION=4.7.0-3+deb13u3 \
# renovate: datasource=repology depName=debian_13/libwebp7
LIBWEBP7_VERSION=1.5.0-0.1 \
# renovate: datasource=repology depName=debian_13/libwebpdemux2
Expand Down Expand Up @@ -218,9 +218,11 @@ RUN rm -rf \
&& useradd --system --gid triplet --uid 100 --home-dir /nonexistent --shell /usr/sbin/nologin triplet

WORKDIR /var/lib/triplet
RUN mkdir -p /var/lib/triplet/cache /var/lib/triplet/testdata/images \
RUN mkdir -p /var/lib/triplet/cache /var/lib/triplet/presentation \
/var/lib/triplet/source-cache /var/lib/triplet/testdata/images \
&& chown -R triplet:triplet /var/lib/triplet
COPY --chown=triplet:triplet deploy/compose/images/ /var/lib/triplet/testdata/images/
COPY --chown=triplet:triplet deploy/compose/presentation/ /var/lib/triplet/presentation/

COPY --from=build /out/triplet /usr/local/bin/triplet
COPY --from=build /out/triplet-healthcheck /usr/local/bin/triplet-healthcheck
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: build test test-integration test-race test-asan install-tools conformance benchmark-fixtures benchmark-iiif benchmark-iiif-pr lint generate fmt docker clean help docs-docker-build docs-build docs-serve docs-preview docs-clean
.PHONY: build test test-integration test-race test-asan install-tools conformance benchmark-fixtures benchmark-iiif benchmark-iiif-pr check-no-inline-python lint generate fmt docker clean help docs-docker-build docs-build docs-serve docs-preview docs-clean

BIN ?= bin/triplet
PKG ?= ./...
Expand Down Expand Up @@ -42,7 +42,10 @@ benchmark-iiif:
benchmark-iiif-pr:
/bin/bash ./scripts/benchmark-iiif-pr.sh

lint:
check-no-inline-python:
go test ./internal/contracts -run TestShellScriptsDoNotInlinePython -count=1

lint: check-no-inline-python
golangci-lint run $(PKG)

fmt:
Expand Down
Loading
Loading