From 017a60ac6c1cd16d04fead92a743b05651cd61b3 Mon Sep 17 00:00:00 2001
From: Damir Ibragimov <ghostklart@yandex.ru>
Date: Thu, 7 Sep 2023 16:04:06 +0000
Subject: [PATCH] autobuild

---
 Dockerfile           | 20 ++++++++++++--------
 build.sh             | 17 +++++++++++++++++
 docker-entrypoint.sh |  2 +-
 3 files changed, 30 insertions(+), 9 deletions(-)
 create mode 100644 build.sh

diff --git a/Dockerfile b/Dockerfile
index 1a0acd7..85fca30 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,20 @@
-FROM ubuntu
+FROM ubuntu:jammy
 
 ENV DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/Moscow
 
-RUN apt update && apt install -y apt-utils dnsutils && apt upgrade -y && apt install -y dante-server iproute2 iptables nano curl wget tini
+ADD danted-init.sh /docker/init.sh
+ADD docker-entrypoint.sh /docker/entrypoint.sh
 
-ENTRYPOINT ["tini", "--"]
+RUN apt update && \
+    apt install -y apt apt-utils dnsutils sudo && \
+    apt upgrade -y && \
+    apt install -y dante-server iproute2 iptables nano curl wget tini && \
+    apt autoremove --purge -y && apt clean -y && rm -rf /tmp/* && \
+    chmod 755 /*.sh
 
-ADD danted-init.sh /danted-init.sh
-ADD docker-entrypoint.sh /docker-entrypoint.sh
-
-RUN chmod 755 /*.sh
+EXPOSE 1080
 
 ENTRYPOINT ["tini", "--"]
 STOPSIGNAL SIGINT
-CMD ["/docker-entrypoint.sh"]
+CMD ["bash", "/docker/entrypoint.sh"]
diff --git a/build.sh b/build.sh
new file mode 100644
index 0000000..d64b1eb
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+export DATE=$(date '+%Y-%m-%d')
+export IMAGENAME=socks-proxy
+export OLDDATE=$(cat .build)
+export REGISTRY=registry.ghostklart.com/dtibragimov
+
+#docker stop officeproxy 
+#docker rm officeproxy
+docker rmi $REGISTRY/$IMAGENAME:$OLDDATE -f
+
+touch .build
+echo $DATE > .build
+
+docker build -t $REGISTRY/$IMAGENAME:$DATE .
+docker tag $REGISTRY/$IMAGENAME:$DATE $REGISTRY/$IMAGENAME:latest
+echo "y" | docker system prune
+docker push $REGISTRY/$IMAGENAME -a
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 87d5af3..70fb3a3 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -2,7 +2,7 @@
 
 starting() {
 	echo "Creating user"
-	bash /danted-init.sh
+	bash /docker/init.sh
 	echo "Starting danted"
 	danted -p /danted.pid
 }