From 6e0dd04d303ee0c139cc163548f1db7ccdf9cce1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 11 Mar 2022 12:35:46 +0100
Subject: [PATCH] base: replace frep with tpl

It's our (simplified) fork: https://github.com/jitsi/tpl
---
 base/Dockerfile         | 6 ++----
 base/rootfs/usr/bin/tpl | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)
 delete mode 100755 base/rootfs/usr/bin/tpl

diff --git a/base/Dockerfile b/base/Dockerfile
index 53774a6..7ef9168 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,23 +1,21 @@
 FROM debian:bullseye-slim
 
 ARG JITSI_RELEASE=stable
-ARG FREP_VERSION=1.3.11
-
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
+ADD https://github.com/jitsi/tpl/releases/download/v1.0.1/tpl-linux-amd64 /usr/bin/tpl
 COPY rootfs /
 
 RUN apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get install -y apt-transport-https apt-utils ca-certificates gnupg wget && \
     wget -qO - https://github.com/just-containers/s6-overlay/releases/download/v1.22.1.0/s6-overlay-amd64.tar.gz | tar xfz - -C / && \
     wget -qO - https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmour > /etc/apt/trusted.gpg.d/jitsi.gpg && \
-    wget -qO /usr/bin/frep https://github.com/subchen/frep/releases/download/v$FREP_VERSION/frep-$FREP_VERSION-linux-amd64 && \
     echo "deb https://download.jitsi.org $JITSI_RELEASE/" > /etc/apt/sources.list.d/jitsi.list && \
     echo "deb http://ftp.debian.org/debian bullseye-backports main" > /etc/apt/sources.list.d/backports.list && \
     apt-dpkg-wrap apt-get update && \
     apt-dpkg-wrap apt-get dist-upgrade -y && \
     apt-cleanup && \
-    chmod +x /usr/bin/frep
+    chmod +x /usr/bin/tpl
 
 RUN [ "$JITSI_RELEASE" = "unstable" ] && \
     apt-dpkg-wrap apt-get update && \
diff --git a/base/rootfs/usr/bin/tpl b/base/rootfs/usr/bin/tpl
deleted file mode 100755
index c18fb0e..0000000
--- a/base/rootfs/usr/bin/tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-exec frep $1:-
-