hoelee/tubesync
1
0
Fork 0
mirror of https://github.com/meeb/tubesync.git synced 2025-06-25 06:26:37 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1087 from tcely/patch-10

Browse Source 
Enable `editor` in the container
This commit is contained in:
meeb 2025-06-11 19:07:47 +10:00 committed by GitHub
commit b985f65446
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Dockerfile
View File

@ -25,6 +25,7 @@ ARG TARGETARCH
ENV DEBIAN_FRONTEND="noninteractive" \ ENV DEBIAN_FRONTEND="noninteractive" \
APT_KEEP_ARCHIVES=1 \ APT_KEEP_ARCHIVES=1 \
EDITOR="editor" \
HOME="/root" \ HOME="/root" \
LANGUAGE="en_US.UTF-8" \ LANGUAGE="en_US.UTF-8" \
LANG="en_US.UTF-8" \ LANG="en_US.UTF-8" \
@ -321,6 +322,8 @@ RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/va
apt-get -y autoclean && \ apt-get -y autoclean && \
rm -v -f /var/cache/debconf/*.dat-old rm -v -f /var/cache/debconf/*.dat-old
# The preference for openresty over nginx,
# is for the newer version.
FROM tubesync-openresty AS tubesync FROM tubesync-openresty AS tubesync
ARG S6_VERSION ARG S6_VERSION
@ -344,6 +347,7 @@ RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/va
apt-get -y --no-install-recommends install \ apt-get -y --no-install-recommends install \
libjpeg62-turbo \ libjpeg62-turbo \
libmariadb3 \ libmariadb3 \
libonig5 \
libpq5 \ libpq5 \
libwebp7 \ libwebp7 \
pkgconf \ pkgconf \
@ -352,10 +356,23 @@ RUN --mount=type=cache,id=apt-lib-cache-${TARGETARCH},sharing=private,target=/va
python3-pip-whl \ python3-pip-whl \
python3-socks \ python3-socks \
curl \ curl \
indent \
less \ less \
lua-lpeg \
tre-agrep \
vis \
xxd \
&& \ && \
# Link to the current python3 version # Link to the current python3 version
ln -v -s -f -T "$(find /usr/local/lib -name 'python3.[0-9]*' -type d -printf '%P\n' | sort -r -V | head -n 1)" /usr/local/lib/python3 && \ ln -v -s -f -T "$(find /usr/local/lib -name 'python3.[0-9]*' -type d -printf '%P\n' | sort -r -V | head -n 1)" /usr/local/lib/python3 && \
# Configure the editor alternatives
touch /usr/local/bin/babi /bin/nano /usr/bin/vim.tiny && \
update-alternatives --install /usr/bin/editor editor /usr/local/bin/babi 50 && \
update-alternatives --install /usr/local/bin/nano nano /bin/nano 10 && \
update-alternatives --install /usr/local/bin/nano nano /usr/local/bin/babi 20 && \
update-alternatives --install /usr/local/bin/vim vim /usr/bin/vim.tiny 15 && \
update-alternatives --install /usr/local/bin/vim vim /usr/bin/vis 35 && \
rm -v /usr/local/bin/babi /bin/nano /usr/bin/vim.tiny && \
# Create a 'app' user which the application will run as # Create a 'app' user which the application will run as
groupadd app && \ groupadd app && \
useradd -M -d /app -s /bin/false -g app app && \ useradd -M -d /app -s /bin/false -g app app && \
@ -407,6 +424,7 @@ RUN --mount=type=tmpfs,target=/cache \
g++ \ g++ \
gcc \ gcc \
libjpeg-dev \ libjpeg-dev \
libonig-dev \
libpq-dev \ libpq-dev \
libwebp-dev \ libwebp-dev \
make \ make \
@ -450,6 +468,7 @@ RUN --mount=type=tmpfs,target=/cache \
g++ \ g++ \
gcc \ gcc \
libjpeg-dev \ libjpeg-dev \
libonig-dev \
libpq-dev \ libpq-dev \
libwebp-dev \ libwebp-dev \
make \ make \

1
Pipfile
View File

@ -25,3 +25,4 @@ emoji = "*"
brotli = "*" brotli = "*"
html5lib = "*" html5lib = "*"
bgutil-ytdlp-pot-provider = "*" bgutil-ytdlp-pot-provider = "*"
babi = "*"