8000 [pull] master from sissbruecker:master by pull[bot] · Pull Request #115 · bryanwills/linkding · GitHub
[go: up one dir, main page]
Skip to content

[pull] master from sissbruecker:master #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 13, 2026
Merged

[pull] master from sissbruecker:master #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions docker/alpine.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ COPY bookmarks/styles ./bookmarks/styles
RUN npm run build


FROM python:3.13.15-alpine3.23 AS build-deps
FROM python:3.13.7-alpine3.22 AS build-deps
# Add required packages
# alpine-sdk linux-headers pkgconfig: build Python packages from source
# libpq-dev: build Postgres client from source
Expand Down Expand Up @@ -49,7 +49,7 @@ RUN wget https://www.sqlite.org/${SQLITE_RELEASE_YEAR}/sqlite-amalgamation-${SQL
gcc -fPIC -shared icu.c `pkg-config --libs --cflags icu-uc icu-io` -o libicu.so


FROM python:3.13.15-alpine3.23 AS linkding
FROM python:3.13.7-alpine3.22 AS linkding
LABEL org.opencontainers.image.source="https://github.com/sissbruecker/linkding"
# install runtime dependencies
RUN apk update && apk add bash curl icu libpq mailcap libssl3 pcre2
Expand Down Expand Up @@ -99,9 +99,11 @@ RUN apk add --no-cache curl jq unzip && \

FROM linkding AS linkding-plus
# install node, chromium
RUN apk update && apk add nodejs npm chromium chromium-swiftshader
RUN apk update && apk add nodejs npm chromium-swiftshader
# install single-file-cli
RUN npm install -g single-file-cli@2.0.75
# pin transitive simple-cdp dependency, newer versions require Node >= 23 (CloseEvent global)
RUN npm install -g single-file-cli@2.0.75 && \
npm install --prefix "$(npm root -g)/single-file-cli" simple-cdp@1.8.6
# copy uBlock
COPY --from=ublock-build /etc/linkding/uBOLite.chromium.mv3 uBOLite.chromium.mv3/
# create chromium profile folder for user running background tasks and set permissions
Expand Down
10 changes: 6 additions & 4 deletions docker/default.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,16 @@ FROM linkding AS linkding-plus
# install chromium
RUN apt-get update && apt-get -y install chromium
# install node
ARG TARGETARCH
RUN if [ "$TARGETARCH" = "arm" ]; then NODE_MAJOR=23; else NODE_MAJOR=24; fi && \
apt-get install -y gnupg2 apt-transport-https ca-certificates && \
ENV NODE_MAJOR=22
RUN apt-get install -y gnupg2 apt-transport-https ca-certificates && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /usr/share/keyrings/nodesource.gpg && \
echo "deb [signed-by=/usr/share/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
apt-get update && apt-get install -y nodejs
# install single-file-cli
RUN npm install -g single-file-cli@2.0.75
# pin transitive simple-cdp dependency, newer versions require Node >= 23 (CloseEvent global)
# future note: Node 24 does not ship an arm/v7 build, drop latest-plus support for that platform at some point
RUN npm install -g single-file-cli@2.0.75 && \
npm install --prefix "$(npm root -g)/single-file-cli" simple-cdp@1.8.6
# copy uBlock
COPY --from=ublock-build /etc/linkding/uBOLite.chromium.mv3 uBOLite.chromium.mv3/
# create chromium profile folder for user running background tasks and set permissions
Expand Down
Loading
0