diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..f6abaab 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -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: "swag" #replace + MODNAME: "ioncube" #replace jobs: build: diff --git a/Dockerfile b/Dockerfile index 4ece5e8..64c1ba7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="Spunkie" # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index db4598e..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -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/ / diff --git a/README.md b/README.md index 5636dec..ccacdf2 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,7 @@ -# Rsync - Docker mod for openssh-server +# Ioncube Loader - Docker mod for SWAG/nginx -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds Ioncube loader to SWAG/nginx, to be installed/updated during container start. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +In SWAG/nginx docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:swag-ioncube` -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 `-`. 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. +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:swag-ioncube|linuxserver/mods:swag-auto-reload` diff --git a/root/etc/cont-init.d/98-ioncube-config b/root/etc/cont-init.d/98-ioncube-config new file mode 100644 index 0000000..69f2626 --- /dev/null +++ b/root/etc/cont-init.d/98-ioncube-config @@ -0,0 +1,42 @@ +#!/usr/bin/with-contenv bash +echo "**** Installing Ioncube Loader ****" + +if php -m | grep -iq "ioncube"; then + echo "**** Ioncube Loader already installed, exiting... ****" + exit 0 +else + ARCH="$(command arch)" + if [ "${ARCH}" = "x86_64" ]; then + ARCH="x86-64" + echo "**** Linux architecture found: x86-64 ****" + elif [ "${ARCH}" = "aarch64" ]; then + ARCH="aarch64" + echo "**** Linux architecture found: arm64 ****" + elif [ "${ARCH}" = "armv7l" ]; then + ARCH="armv7l" + echo "**** Linux architecture found: armhf ****" + else + echo "**** Unsupported Linux architecture ${ARCH} found, exiting... ****" + exit 1 + fi + + PHP_MAJOR_VERSION="$(command php -r 'echo PHP_MAJOR_VERSION;')" + PHP_MINOR_VERSION="$(command php -r 'echo PHP_MINOR_VERSION;')" + echo "**** PHP Version found: ${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}.x ****" + + echo "**** Downloading Ioncube Loader... ****" + wget https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_${ARCH}.tar.gz -P /tmp/ + echo "**** Ioncube Loader downloaded: ioncube_loaders_lin_${ARCH}.tar.gz ****" + + echo "**** Extracting Ioncube Loader... ****" + tar -C /tmp -xzvf /tmp/ioncube_loaders_lin_${ARCH}.tar.gz \ + && mkdir -p /usr/local/ioncube && cp /tmp/ioncube/*.so /usr/local/ioncube \ + && rm /tmp/ioncube_loaders_lin_${ARCH}.tar.gz && rm -rf /tmp/ioncube + echo "**** Ioncube Loader extracted: /usr/local/ioncube ****" + + echo "zend_extension = /usr/local/ioncube/ioncube_loader_lin_${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}.so" \ + > /etc/php${PHP_MAJOR_VERSION}/conf.d/00-ioncube.ini + echo "**** Ioncube Loader PHP extension enabled: ioncube_loader_lin_${PHP_MAJOR_VERSION}.${PHP_MINOR_VERSION}.so ****" + + echo "**** Ioncube Loader Installed ****" +fi \ No newline at end of file diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f9127..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -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 diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16