From 1ff775db80e95588bdd930a62bc015a5838c2e98 Mon Sep 17 00:00:00 2001
From: Joerg Elfring <devops@elfrinjo.de>
Date: Thu, 23 Jul 2020 14:35:44 +0200
Subject: [PATCH] Remove profanitiy

---
 docker-compose.yaml         |  4 ----
 profanity/Dockerfile        | 44 -------------------------------------
 profanity/README.md         | 12 ----------
 profanity/assets/mirrorlist |  4 ----
 profanity/assets/sudoers    |  1 -
 5 files changed, 65 deletions(-)
 delete mode 100644 profanity/Dockerfile
 delete mode 100644 profanity/README.md
 delete mode 100644 profanity/assets/mirrorlist
 delete mode 100644 profanity/assets/sudoers

diff --git a/docker-compose.yaml b/docker-compose.yaml
index a8660a0..ef0f9f9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,7 +19,3 @@ services:
     build: ./torrelay
     image: elfrinjo/torrelay:latest
 
-  profanity:
-    build: ./profanity
-    image: elfrinjo/profanity:latest
-
diff --git a/profanity/Dockerfile b/profanity/Dockerfile
deleted file mode 100644
index adfb114..0000000
--- a/profanity/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM archlinux/base:latest
-LABEL maintainer "J. Elfring <devops@elfrinjo.de>"
-
-## Set faster mirrors
-COPY assets/mirrorlist /etc/pacman.d/mirrorlist
-
-## Install prereqs and create a user with
-## administrative privileges to install packages
-RUN pacman --sync --refresh --needed --noconfirm \
-		base-devel \
-		git \
-	&& useradd --create-home user
-COPY assets/sudoers /etc/sudoers
-
-## Switch to the new user and install yaourt from aur
-USER user
-RUN cd /tmp \
-	## Install package-query, a prereq for yaourt
-	&& curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/package-query.tar.gz \
-	&& tar -xvzf package-query.tar.gz \
-	&& cd package-query \
-	&& makepkg -si --noconfirm \
-	&& cd /tmp \
-	&& rm -rf package-query.tar.gz package-query \
-	## Install yaourt
-	&& curl -O https://aur.archlinux.org/cgit/aur.git/snapshot/yaourt.tar.gz \
-	&& tar -xvzf yaourt.tar.gz \
-	&& cd yaourt \
-	&& makepkg -si --noconfirm \
-	&& cd /tmp \
-	&& rm -rf yaourt.tar.gz yaourt \
-	## Install profanity
-    && cd /home/user \
-	&& yaourt --sync --noconfirm profanity-git
-	## Cleanup
-RUN  sudo pacman --noconfirm -Rcns yaourt package-query git \
-	&& pacman -Qgq base > /tmp/pkg_base \
-	&& pacman -Qgq base-devel > /tmp/pkg_base-devel \
-	&& grep -f /tmp/pkg_base -v /tmp/pkg_base-devel > /tmp/pkg_devel 
-	#&& sudo pacman --noconfirm -Rsu base-devel \
- 	#&& sudo pacman --noconfirm -Rsn $(pacman -Qqdt)
-
-WORKDIR /home/user
-CMD ["/usr/sbin/profanity"]
diff --git a/profanity/README.md b/profanity/README.md
deleted file mode 100644
index 01a5d0c..0000000
--- a/profanity/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Profanity XMPP Client
-Docker image for running the profanity xmpp client based on Arch Linux.
-Profanity is installed from aur/profanity-git.
-OMEMO is available,
-
-## Usage
-```console
-# sudo docker run -ti --rm \
-    -v ~/.local/share/profanity:/home/user/.local/share/profanity \
-    -v ~/.config/profanity/:/home/user/.config/profanity \
-    elfrinjo/profanity:latest
-```
diff --git a/profanity/assets/mirrorlist b/profanity/assets/mirrorlist
deleted file mode 100644
index c91a83b..0000000
--- a/profanity/assets/mirrorlist
+++ /dev/null
@@ -1,4 +0,0 @@
-Server = http://ftp.gwdg.de/pub/linux/archlinux/$repo/os/$arch
-Server = http://ftp.fau.de/archlinux/$repo/os/$arch
-Server = https://ftp.fau.de/archlinux/$repo/os/$arch
-
diff --git a/profanity/assets/sudoers b/profanity/assets/sudoers
deleted file mode 100644
index 304dba9..0000000
--- a/profanity/assets/sudoers
+++ /dev/null
@@ -1 +0,0 @@
-user ALL = NOPASSWD: ALL