Browse Source

chore(docker): on aarch64, do not run upx

zhanghongtong 4 years ago
parent
commit
d6c2bdb96b
3 changed files with 6 additions and 6 deletions
  1. 2 2
      deploy/docker/Dockerfile
  2. 2 2
      deploy/docker/Dockerfile-alpine
  3. 2 2
      deploy/docker/Dockerfile-slim

+ 2 - 2
deploy/docker/Dockerfile

@@ -4,13 +4,13 @@ COPY . /go/kuiper
 
 WORKDIR /go/kuiper
 
-RUN apt update && apt install -y upx pkg-config libczmq-dev
+RUN apt update && apt install -y pkg-config libczmq-dev
 
 RUN make build_with_edgex \
     && ln -s /go/kuiper/_build/kuiper-$(git describe --tags --always)-$(uname -s | tr "[A-Z]" "[a-z]")-$(uname -m) /usr/local/kuiper 
 
 RUN go build  -o kuiper_conf_util deploy/docker/conf_util.go \
-    && upx ./kuiper_conf_util \
+    && if [ "$(uname -m)" != "aarch64" ]; then apt install -y upx && upx ./kuiper_conf_util; fi \
     && ln -s /go/kuiper/kuiper_conf_util /usr/bin/kuiper_conf_util
 
 RUN ln -s /go/kuiper/deploy/docker/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh

+ 2 - 2
deploy/docker/Dockerfile-alpine

@@ -4,9 +4,9 @@ COPY . /go/kuiper
 
 WORKDIR /go/kuiper
 
-RUN apk add upx gcc make git libc-dev binutils-gold pkgconfig zeromq-dev 
+RUN apk add gcc make git libc-dev binutils-gold pkgconfig zeromq-dev 
 RUN go build  -o kuiper_conf_util deploy/docker/conf_util.go \
-    && upx ./kuiper_conf_util
+    && if [ "$(uname -m)" != "aarch64" ]; then apk add upx && upx ./kuiper_conf_util; fi
 RUN make build_with_edgex
 
 FROM alpine:3.10

+ 2 - 2
deploy/docker/Dockerfile-slim

@@ -4,9 +4,9 @@ COPY . /go/kuiper
 
 WORKDIR /go/kuiper
 
-RUN apt update && apt install -y upx pkg-config libczmq-dev
+RUN apt update && apt install -y pkg-config libczmq-dev
 RUN go build  -o kuiper_conf_util deploy/docker/conf_util.go \
-    && upx ./kuiper_conf_util
+    && if [ "$(uname -m)" != "aarch64" ]; then apt install -y upx && upx ./kuiper_conf_util; fi
 RUN make build_with_edgex
 
 FROM debian:10