From 5b11952899de62de73f04a76591cbebe98145d14 Mon Sep 17 00:00:00 2001
From: Marco Ochse <t3chn0m4g3@gmail.com>
Date: Mon, 28 May 2018 16:43:32 +0000
Subject: [PATCH] cleanup

---
 docker/glutton/Dockerfile.multi | 59 ---------------------------------
 docker/glutton/Dockerfile.old   | 52 -----------------------------
 2 files changed, 111 deletions(-)
 delete mode 100644 docker/glutton/Dockerfile.multi
 delete mode 100644 docker/glutton/Dockerfile.old

diff --git a/docker/glutton/Dockerfile.multi b/docker/glutton/Dockerfile.multi
deleted file mode 100644
index ab46ab0b..00000000
--- a/docker/glutton/Dockerfile.multi
+++ /dev/null
@@ -1,59 +0,0 @@
-### Builder
-FROM alpine
-
-# Include dist
-ADD dist/ /root/dist/
-  
-# Setup apk
-RUN apk -U --no-cache add \
-                   build-base \
-                   git \
-                   go \
-                   g++ \
-                   iptables-dev \
-                   libnetfilter_queue-dev \
-                   libcap \
-                   libpcap-dev && \
-
-# Setup go, build glutton
-    export GOPATH=/opt/go/ && \
-    mkdir -p /opt/go/ && \
-    go get -d github.com/mushorg/glutton && \
-    go get -u github.com/golang/dep/cmd/dep && \
-    mv /root/dist/system.go /opt/go/src/github.com/mushorg/glutton/ && \
-    cd /opt/go/src/github.com/mushorg/glutton/ && \
-    /opt/go/bin/dep ensure && \
-    make build && \
-    cd / && \
-    mkdir glutton && \
-    mv /opt/go/src/github.com/mushorg/glutton/bin /glutton && \
-    mv /opt/go/src/github.com/mushorg/glutton/config /glutton && \
-    mv /opt/go/src/github.com/mushorg/glutton/rules /glutton && \
-    mv /root/dist/rules.yaml /glutton/rules/
-
-### Final Image
-FROM alpine
-
-COPY --from=0 /glutton /opt/glutton/
-
-# Add deps
-RUN apk -U --no-cache add iptables-dev \
-                          libcap && \
-
-# Setup user, groups and configs
-    ls -R /opt/glutton && \
-    addgroup -g 2000 glutton && \
-    adduser -S -s /bin/ash -u 2000 -D -g 2000 glutton && \
-    mkdir -p /var/log/glutton && \
-
-# Setup glutton
-    setcap cap_net_admin,cap_net_raw=+ep /opt/glutton/bin/server && \
-    setcap cap_net_admin,cap_net_raw=+ep /sbin/xtables-multi && \
-
-    rm -rf /var/cache/apk/*
-
-
-# Start glutton 
-WORKDIR /opt/glutton
-USER glutton:glutton
-CMD exec bin/server -i $(/sbin/ip address | grep '^2: ' | awk '{ print $2 }' | tr -d [:punct:]) -l /var/log/glutton/glutton.log
diff --git a/docker/glutton/Dockerfile.old b/docker/glutton/Dockerfile.old
deleted file mode 100644
index 0507d55e..00000000
--- a/docker/glutton/Dockerfile.old
+++ /dev/null
@@ -1,52 +0,0 @@
-FROM alpine
-
-# Include dist
-ADD dist/ /root/dist/
-  
-# Setup apk
-RUN apk -U --no-cache add \
-                   build-base \
-                   git \
-                   go \
-                   g++ \
-                   iptables-dev \
-                   libnetfilter_queue-dev \
-                   libcap \
-                   libpcap-dev && \
-
-# Setup go, glutton
-    export GOPATH=/opt/go/ && \
-    mkdir -p /opt/go/ && \
-    go get -d github.com/mushorg/glutton && \
-    go get -u github.com/golang/dep/cmd/dep && \
-    mv /root/dist/system.go /opt/go/src/github.com/mushorg/glutton/ && \
-    cd /opt/go/src/github.com/mushorg/glutton/ && \
-    /opt/go/bin/dep ensure && \
-    make build && \
-    cd / && \
-    mkdir -p /opt/glutton && \
-    mv /opt/go/src/github.com/mushorg/glutton/bin /opt/glutton/ && \
-    mv /opt/go/src/github.com/mushorg/glutton/config /opt/glutton/ && \
-    mv /opt/go/src/github.com/mushorg/glutton/rules /opt/glutton/ && \
-    setcap cap_net_admin,cap_net_raw=+ep /opt/glutton/bin/server && \
-    setcap cap_net_admin,cap_net_raw=+ep /sbin/xtables-multi && \
-
-# Setup user, groups and configs
-    addgroup -g 2000 glutton && \
-    adduser -S -s /bin/ash -u 2000 -D -g 2000 glutton && \
-    mkdir -p /var/log/glutton && \
-    mv /root/dist/rules.yaml /opt/glutton/rules/ && \
-
-# Clean up
-    apk del --purge build-base \
-                    git \
-                    go \
-                    g++ && \
-    rm -rf /var/cache/apk/* \
-           /opt/go \
-           /root/dist
-
-# Start glutton 
-WORKDIR /opt/glutton
-USER glutton:glutton
-CMD exec bin/server -i $(/sbin/ip address | grep '^2: ' | awk '{ print $2 }' | tr -d [:punct:]) -l /var/log/glutton/glutton.log