From 421b3d3020725b9c59af186fb4d423dbb09f42f5 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Tue, 14 Jun 2022 07:51:14 +0000
Subject: [PATCH] bump medpot to latest master

---
 docker/medpot/Dockerfile     | 24 +++++++++--------
 docker/medpot/Dockerfile.new | 51 ------------------------------------
 2 files changed, 13 insertions(+), 62 deletions(-)
 delete mode 100644 docker/medpot/Dockerfile.new

diff --git a/docker/medpot/Dockerfile b/docker/medpot/Dockerfile
index b5d483df..5995e177 100644
--- a/docker/medpot/Dockerfile
+++ b/docker/medpot/Dockerfile
@@ -8,27 +8,29 @@ RUN apk -U --no-cache add \
                    g++ && \
 #
 # Setup go, build medpot
-    export GOPATH=/opt/go/ && \
+    export GOPATH=/tmp && \
     export GO111MODULE=off && \
-    mkdir -p /opt/go/src && \
-    cd /opt/go/src && \
-    git clone https://github.com/schmalle/medpot && \
-    cd medpot && \
-    git checkout 75a2e6134cf926c35b6017d62542274434c87388 && \
-    cd .. && \
+    cd /tmp && \
     go get -d -v github.com/davecgh/go-spew/spew && \
     go get -d -v github.com/go-ini/ini && \
     go get -d -v github.com/mozillazg/request && \
     go get -d -v go.uber.org/zap && \
+    go get -d -v github.com/s9rA16Bf4/ArgumentParser/go/arguments && \
+    go get -d -v github.com/s9rA16Bf4/notify_handler/go/notify && \
+#    git clone https://github.com/schmalle/medpot && \
+    git clone https://github.com/s9rA16Bf4/medpot && \
     cd medpot && \
-    cp dist/etc/ews.cfg /etc/ && \
-    go build medpot && \
+#    git checkout 75a2e6134cf926c35b6017d62542274434c87388 && \
+    git checkout dd9833786bb56cd40c11dfb15e0dd57298e249e8 && \
+    sed -i s/"ews = true"/"ews = false"/g template/ews.cfg && \
+    go build -o medpot go/medpot.go go/logo.go && \
 #
 # Setup medpot
-    mkdir -p /opt/medpot \
+    mkdir -p /etc/medpot \
+             /opt/medpot \
              /var/log/medpot && \
     cp medpot /opt/medpot && \
-    cp /opt/go/src/medpot/template/*.xml /opt/medpot/ && \
+    cp ./template/* /etc/medpot && \
 #
 # Setup user, groups and configs
     addgroup -g 2000 medpot && \
diff --git a/docker/medpot/Dockerfile.new b/docker/medpot/Dockerfile.new
deleted file mode 100644
index 9851390d..00000000
--- a/docker/medpot/Dockerfile.new
+++ /dev/null
@@ -1,51 +0,0 @@
-FROM alpine:3.16
-#
-# Setup apk
-RUN apk -U --no-cache add \
-                   build-base \
-                   git \
-                   go \
-                   g++ && \
-#
-# Setup go, build medpot
-    export GOPATH=/tmp && \
-    export GO111MODULE=off && \
-    cd /tmp && \
-    go get -d -v github.com/davecgh/go-spew/spew && \
-    go get -d -v github.com/go-ini/ini && \
-    go get -d -v github.com/mozillazg/request && \
-    go get -d -v go.uber.org/zap && \
-    go get -d -v github.com/s9rA16Bf4/ArgumentParser/go/arguments && \
-    go get -d -v github.com/s9rA16Bf4/notify_handler/go/notify && \
-    git clone https://github.com/schmalle/medpot && \
-    cd medpot && \
-#    git checkout 75a2e6134cf926c35b6017d62542274434c87388 && \
-    git checkout 3ec8740258d85ab3558659c727226d752ecaa43f && \
-    sed -i s/"ews = true"/"ews = false"/g template/ews.cfg && \
-    go build -o medpot go/medpot.go go/logo.go && \
-#
-# Setup medpot
-    mkdir -p /etc/medpot \
-             /opt/medpot \
-             /var/log/medpot && \
-    cp medpot /opt/medpot && \
-    cp ./template/* /etc/medpot && \
-#
-# Setup user, groups and configs
-    addgroup -g 2000 medpot && \
-    adduser -S -s /bin/ash -u 2000 -D -g 2000 medpot && \
-    chown -R medpot:medpot /var/log/medpot && \
-#
-# Clean up
-    apk del --purge build-base \
-                    git \
-                    go \
-                    g++ && \
-    rm -rf /var/cache/apk/* \
-           /opt/go \
-           /root/dist
-#
-# Start medpot
-WORKDIR /opt/medpot
-USER medpot:medpot
-CMD ["./medpot"]