From f3fd77820264799e604abf47521ed706aefe91a5 Mon Sep 17 00:00:00 2001
From: Evan Chen <evanchen@kumoly.io>
Date: Sat, 16 Oct 2021 01:20:39 +0800
Subject: [PATCH] 0.1.2-rc1

---
 Dockerfile | 8 +++++++-
 Makefile   | 7 +++++--
 README.md  | 9 +++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f7e151c..f840702 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,14 @@ RUN VERSION=$(git describe --tags) BUILD=$(git rev-parse --short HEAD) && \
         -o /go/bin/myip main.go
 
 FROM alpine:3.14
+
 EXPOSE 5080
+ENV PATH="/go/bin:${PATH}"
 
 COPY --from=builder /usr/share/zoneinfo /usr/share/zoneinfo
 COPY --from=builder /go/bin/myip /go/bin/myip
-ENTRYPOINT ["/go/bin/myip","serve"]
+CMD ["/go/bin/myip","serve"]
+
+# use cmd instead for flexibility
+# ENTRYPOINT ["/go/bin/myip","serve"]
+
diff --git a/Makefile b/Makefile
index 6211117..a730bcb 100644
--- a/Makefile
+++ b/Makefile
@@ -33,12 +33,15 @@ docker:
 	-t $(HUB)/$(HUB_PROJECT)/$(PROJ):$(VERSION) \
 	.
 
-release: build-bins build-m1 docker
+docker-push:
 	docker tag $(HUB)/$(HUB_PROJECT)/$(PROJ):$(VERSION) $(HUB)/$(HUB_PROJECT)/$(PROJ):latest
 	docker push $(HUB)/$(HUB_PROJECT)/$(PROJ):$(VERSION)
 	docker push $(HUB)/$(HUB_PROJECT)/$(PROJ):latest
 
-save:
+docker-save:
 	docker save -o dist/$(PROJ)-$(VERSION)-${BUILD}.tar $(HUB)/$(HUB_PROJECT)/$(PROJ):$(VERSION)
 
+
+release: build-bins build-m1 docker docker-save docker-push
+
 .PHONY: build docker release clean all
\ No newline at end of file
diff --git a/README.md b/README.md
index 9c413d5..5843c57 100644
--- a/README.md
+++ b/README.md
@@ -30,3 +30,12 @@ Flags:
 
 Use "myip [command] --help" for more information about a command.
 ```
+
+## Docker
+
+Server:
+
+```shell
+docker pull hub.kumoly.io/tools/myip:latest
+docker run --name myip-server -d -p 5080:5080 --restart=always hub.kumoly.io/tools/myip
+```