From fc237451dda464cc1298ff35301ff1ffd8a63aa8 Mon Sep 17 00:00:00 2001
From: mattx <10520670+mattx433@users.noreply.github.com>
Date: Wed, 13 Oct 2021 18:51:49 +0200
Subject: [PATCH] firefox: fonts initial release

---
 .github/workflows/BuildImage.yml   |  4 ++--
 Dockerfile                         |  2 +-
 Dockerfile.complex                 | 23 -----------------------
 README.md                          | 18 ++++--------------
 root/etc/cont-init.d/98-fonts      |  2 ++
 root/etc/cont-init.d/98-vpn-config | 27 ---------------------------
 root/etc/services.d/sshvpn/run     |  3 ---
 7 files changed, 9 insertions(+), 70 deletions(-)
 delete mode 100644 Dockerfile.complex
 create mode 100644 root/etc/cont-init.d/98-fonts
 delete mode 100644 root/etc/cont-init.d/98-vpn-config
 delete mode 100644 root/etc/services.d/sshvpn/run

diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 518b0d8..e207252 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: "firefox" #replace
+  MODNAME: "fonts" #replace
 
 jobs:
   build:
diff --git a/Dockerfile b/Dockerfile
index 4ece5e8..1f1d3ee 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM scratch
 
-LABEL maintainer="username"
+LABEL maintainer="mattx433"
 
 # 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..45d9b0f 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,7 @@
-# Rsync - Docker mod for openssh-server
+# Fonts - Docker mod for firefox
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod adds font packages to firefox, to be installed/updated during container start.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
+In firefox docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:firefox-fonts`
 
-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.
+If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:firefox-fonts|linuxserver/mods:firefox-mod2`
diff --git a/root/etc/cont-init.d/98-fonts b/root/etc/cont-init.d/98-fonts
new file mode 100644
index 0000000..fb83b97
--- /dev/null
+++ b/root/etc/cont-init.d/98-fonts
@@ -0,0 +1,2 @@
+#!/usr/bin/with-contenv bash
+apk info --installed ttf-dejavu >/dev/null || apk add --no-cache ttf-dejavu font-noto-emoji font-croscore
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