mirror of
https://github.com/TrezOne/docker-mods-uptime-kuma-timeout-fix.git
synced 2026-06-17 13:52:56 -04:00
Merge pull request #339 from JonathanTreffler/nextcloud-mediadc
Nextcloud mediadc
This commit is contained in:
aptalca
GitHub
@@ -4,8 +4,8 @@ on: [push, pull_request, workflow_dispatch]
|
||||
|
||||
env:
|
||||
ENDPOINT: "linuxserver/mods" #don't modify
|
||||
BASEIMAGE: "replace_baseimage" #replace
|
||||
MODNAME: "replace_modname" #replace
|
||||
BASEIMAGE: "nextcloud" #replace
|
||||
MODNAME: "mediadc" #replace
|
||||
|
||||
jobs:
|
||||
build:
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
FROM scratch
|
||||
|
||||
LABEL maintainer="username"
|
||||
LABEL maintainer="JonathanTreffler"
|
||||
|
||||
# copy local files
|
||||
COPY root/ /
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
## Buildstage ##
|
||||
FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
|
||||
|
||||
RUN \
|
||||
echo "**** install packages ****" && \
|
||||
apk add --no-cache \
|
||||
curl && \
|
||||
echo "**** grab rclone ****" && \
|
||||
mkdir -p /root-layer && \
|
||||
curl -o \
|
||||
/root-layer/rclone.deb -L \
|
||||
"https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb"
|
||||
|
||||
# copy local files
|
||||
COPY root/ /root-layer/
|
||||
|
||||
## Single layer deployed image ##
|
||||
FROM scratch
|
||||
|
||||
LABEL maintainer="username"
|
||||
|
||||
# Add files from buildstage
|
||||
COPY --from=buildstage /root-layer/ /
|
||||
@@ -1,25 +1,7 @@
|
||||
# Rsync - Docker mod for openssh-server
|
||||
# MediaDC - Docker mod for nextcloud
|
||||
|
||||
This mod adds rsync to openssh-server, to be installed/updated during container start.
|
||||
This mod adds the required and optional packages the [MediaDC](https://apps.nextcloud.com/apps/mediadc) nextcloud app needs to work.
|
||||
|
||||
In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
|
||||
In nextcloud docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:nextcloud-mediadc`
|
||||
|
||||
If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2`
|
||||
|
||||
# Mod creation instructions
|
||||
|
||||
* Fork the repo, create a new branch based on the branch `template`.
|
||||
* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done.
|
||||
* Inspect the `root` folder contents. Edit, add and remove as necessary.
|
||||
* Edit this readme with pertinent info, delete these instructions.
|
||||
* Finally edit the `.github/workflows/BuildImage.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`.
|
||||
* Ask the team to create a new branch named `<baseimagename>-<modname>`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch.
|
||||
* Submit PR against the branch created by the team.
|
||||
|
||||
|
||||
## Tips and tricks
|
||||
|
||||
* To decrease startup times when multiple mods are used, we have consolidated `apt-get update` down to one file. As seen in the [nodejs mod](https://github.com/linuxserver/docker-mods/tree/code-server-nodejs/root/etc/cont-init.d)
|
||||
* Some images has helpers built in, these images are currently:
|
||||
* [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files)
|
||||
* [Code-server](https://github.com/linuxserver/docker-code-server/pull/95)
|
||||
If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:nextcloud-mediadc|linuxserver/mods:nextcloud-mod2`
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
ALPINE_VER=$(cat /etc/apk/repositories | grep main | sed 's|.*alpine/v||' | sed 's|/main.*||')
|
||||
if [ "${ALPINE_VER}" = "3.14" ]; then
|
||||
PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine/"
|
||||
else
|
||||
PIP_ARGS="-f https://wheel-index.linuxserver.io/alpine-${ALPINE_VER}/"
|
||||
fi
|
||||
|
||||
echo "**** Installing required packages ****"
|
||||
apk add --no-cache \
|
||||
ffmpeg \
|
||||
imagemagick \
|
||||
supervisor \
|
||||
py3-numpy \
|
||||
py3-pillow \
|
||||
py3-asn1crypto
|
||||
|
||||
echo "**** Installing optional packages ****"
|
||||
apk add --no-cache \
|
||||
py3-cffi \
|
||||
py3-scipy \
|
||||
py3-pynacl \
|
||||
py3-cryptography \
|
||||
py3-pip
|
||||
|
||||
if [ $(arch) = "armv7l" ]; then
|
||||
echo "**** Installing build deps for pillow_heif on arm32v7, compiling pillow_heif may take a long time in the next step ****"
|
||||
apk add --no-cache \
|
||||
python3-dev \
|
||||
libtool \
|
||||
git \
|
||||
gcc \
|
||||
m4 \
|
||||
perl \
|
||||
alpine-sdk \
|
||||
cmake \
|
||||
aom-dev
|
||||
fi
|
||||
|
||||
echo "**** Installing pillow_heif, hexhamming and pywavelets ****"
|
||||
python3 -m pip install -U pip wheel setuptools
|
||||
python3 -m pip install ${PIP_ARGS} pillow_heif hexhamming pywavelets
|
||||
@@ -1,27 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
# Determine if setup is needed
|
||||
if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \
|
||||
[ -f /usr/bin/apt ]; then
|
||||
## Ubuntu
|
||||
apt-get update
|
||||
apt-get install --no-install-recommends -y \
|
||||
iptables \
|
||||
openssh-client \
|
||||
python3 \
|
||||
python3-pip
|
||||
pip3 install sshuttle
|
||||
fi
|
||||
if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \
|
||||
[ -f /sbin/apk ]; then
|
||||
# Alpine
|
||||
apk add --no-cache \
|
||||
iptables \
|
||||
openssh \
|
||||
py3-pip \
|
||||
python3
|
||||
pip3 install sshuttle
|
||||
fi
|
||||
|
||||
chown -R root:root /root
|
||||
chmod -R 600 /root/.ssh
|
||||
@@ -1,3 +0,0 @@
|
||||
#!/usr/bin/with-contenv bash
|
||||
|
||||
sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16
|
||||
Reference in New Issue
Block a user