apply from nshttpd#67 pr

uuland · Apr 30, 2021 · ccc1aef · ccc1aef
1 parent ee9f4d0
commit ccc1aef
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 70 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,8 @@
-FROM debian:9.9-slim
-
-EXPOSE 9436
-
-COPY scripts/start.sh /app/
-COPY dist/mikrotik-exporter_linux_amd64 /app/mikrotik-exporter
-
-RUN chmod 755 /app/*
-
-ENTRYPOINT ["/app/start.sh"]
+FROM golang:1.16 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build
+
+FROM scratch
+COPY --from=builder /go/src/app/mikrotik-exporter /mikrotik-exporter
+ENTRYPOINT ["/mikrotik-exporter"]
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
@@ -1,8 +1,8 @@
-FROM arm64v8/busybox:1.31.0
+FROM golang:1.16 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build
 
-EXPOSE 9090
-
-COPY scripts/start.sh /app/
-COPY dist/mikrotik-exporter_linux_arm64 /app/mikrotik-exporter
-
-ENTRYPOINT ["/app/start.sh"]
+FROM scratch
+COPY --from=builder /go/src/app/mikrotik-exporter /mikrotik-exporter
+ENTRYPOINT ["/mikrotik-exporter"]
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -1,10 +1,8 @@
-FROM arm32v7/busybox:1.27.2
-
-EXPOSE 9090
-
-COPY scripts/start.sh /app/
-COPY dist/mikrotik-exporter_linux_arm /app/mikrotik-exporter
-
-RUN chmod 755 /app/*
-
-ENTRYPOINT ["/app/start.sh"]
+FROM golang:1.16 AS builder
+WORKDIR /go/src/app
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=arm go build
+
+FROM scratch
+COPY --from=builder /go/src/app/mikrotik-exporter /mikrotik-exporter
+ENTRYPOINT ["/mikrotik-exporter"]
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module mikrotik-exporter
 
-go 1.13
+go 1.16
 
 require (
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect

diff --git a/scripts/build-armhf.sh b/scripts/build-armhf.sh
diff --git a/scripts/build.sh b/scripts/build.sh
diff --git a/scripts/start.sh b/scripts/start.sh