From e431ebc97e74711c3796a1693677de5a8aab69ea Mon Sep 17 00:00:00 2001
From: cnbattle <qiaicn@gmail.com>
Date: Sat, 29 Oct 2022 11:03:45 +0800
Subject: [PATCH] U dockerfile

---
 .drone.yml                      | 1 +
 Dockerfile                      | 1 +
 docker/Dockerfile.linux.amd64   | 5 ++---
 docker/Dockerfile.linux.arm     | 5 ++---
 docker/Dockerfile.linux.arm64   | 5 ++---
 docker/Dockerfile.windows.amd64 | 9 ---------
 6 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 docker/Dockerfile.windows.amd64

diff --git a/.drone.yml b/.drone.yml
index 997db8f..af89cab 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -133,6 +133,7 @@ trigger:
 depends_on:
   - testing
 
+
 ---
 kind: pipeline
 name: linux-arm64
diff --git a/Dockerfile b/Dockerfile
index 6ed1006..e442c9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,6 @@
 FROM alpine
 
+RUN apk add --no-cache ca-certificates xz && rm -rf /var/cache/apk/*
 ADD https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-amd64_linux.tar.xz /usr/local
 RUN xz -d -c /usr/local/upx-4.0.0-amd64_linux.tar.xz | tar -xOf - upx-4.0.0-amd64_linux/upx > /bin/upx && \
     chmod a+x /bin/upx
diff --git a/docker/Dockerfile.linux.amd64 b/docker/Dockerfile.linux.amd64
index 68c53c0..026cbe1 100644
--- a/docker/Dockerfile.linux.amd64
+++ b/docker/Dockerfile.linux.amd64
@@ -1,11 +1,10 @@
 FROM plugins/base:linux-amd64
 
+RUN apk add --no-cache ca-certificates xz && rm -rf /var/cache/apk/*
 ADD https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-amd64_linux.tar.xz /usr/local
 RUN xz -d -c /usr/local/upx-4.0.0-amd64_linux.tar.xz | tar -xOf - upx-4.0.0-amd64_linux/upx > /bin/upx && \
     chmod a+x /bin/upx
 
-RUN apk add --no-cache ca-certificates && \
-  rm -rf /var/cache/apk/*
-
 COPY release/linux/amd64/drone-upx /bin/
+
 ENTRYPOINT ["/bin/drone-upx"]
diff --git a/docker/Dockerfile.linux.arm b/docker/Dockerfile.linux.arm
index 8d6b92c..cbf9691 100644
--- a/docker/Dockerfile.linux.arm
+++ b/docker/Dockerfile.linux.arm
@@ -1,11 +1,10 @@
 FROM plugins/base:linux-arm
 
+RUN apk add --no-cache ca-certificates xz && rm -rf /var/cache/apk/*
 ADD https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-arm_linux.tar.xz /usr/local
 RUN xz -d -c /usr/local/upx-4.0.0-arm_linux.tar.xz | tar -xOf - upx-4.0.0-arm_linux/upx > /bin/upx && \
     chmod a+x /bin/upx
 
-RUN apk add --no-cache ca-certificates && \
-  rm -rf /var/cache/apk/*
-
 COPY release/linux/arm/drone-upx /bin/
+
 ENTRYPOINT ["/bin/drone-upx"]
diff --git a/docker/Dockerfile.linux.arm64 b/docker/Dockerfile.linux.arm64
index 1af493c..fe2103e 100644
--- a/docker/Dockerfile.linux.arm64
+++ b/docker/Dockerfile.linux.arm64
@@ -1,11 +1,10 @@
 FROM plugins/base:linux-arm64
 
+RUN apk add --no-cache ca-certificates xz && rm -rf /var/cache/apk/*
 ADD https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-arm64_linux.tar.xz /usr/local
 RUN xz -d -c /usr/local/upx-4.0.0-arm64_linux.tar.xz | tar -xOf - upx-4.0.0-arm64_linux/upx > /bin/upx && \
     chmod a+x /bin/upx
 
-RUN apk add --no-cache ca-certificates && \
-  rm -rf /var/cache/apk/*
-
 COPY release/linux/arm64/drone-upx /bin/
+
 ENTRYPOINT ["/bin/drone-upx"]
diff --git a/docker/Dockerfile.windows.amd64 b/docker/Dockerfile.windows.amd64
deleted file mode 100644
index 3ca7bfc..0000000
--- a/docker/Dockerfile.windows.amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM microsoft/nanoserver:10.0.14393.1884
-
-ADD https://github.com/upx/upx/releases/download/v4.0.0/upx-4.0.0-amd64_linux.tar.xz /usr/local
-RUN xz -d -c /usr/local/upx-4.0.0-amd64_linux.tar.xz | tar -xOf - upx-4.0.0-amd64_linux/upx > /bin/upx && \
-    chmod a+x /bin/upx
-
-COPY drone-upx.exe /drone-upx.exe
-
-ENTRYPOINT [ "\\drone-upx.exe" ]