Browse Source

Merge pull request #355 from zhanghongtong/chore/change-base-docker-image

Chore/change base docker image
jinfahua 4 years atrás
parent
commit
268c1a444e

+ 1 - 1
.github/workflows/build_packages.yaml

@@ -46,7 +46,7 @@ jobs:
         - uses: actions/checkout@v2
         - uses: actions/setup-go@v1
           with:
-            go-version: '1.13.10'
+            go-version: '1.14'
         - name: prepare
           run: |
               /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"

+ 2 - 2
.github/workflows/run_fvt_tests.yaml

@@ -14,7 +14,7 @@ jobs:
         steps:
         - uses: actions/setup-go@v1
           with:
-            go-version: '1.13.10'
+            go-version: '1.14'
         - uses: actions/setup-java@v1
           with:
             java-version: '8' # The JDK version to make available on the path.
@@ -77,7 +77,7 @@ jobs:
         steps:
         - uses: actions/setup-go@v1
           with:
-            go-version: '1.13.10'
+            go-version: '1.14'
         - uses: actions/setup-java@v1
           with:
             java-version: '8' # The JDK version to make available on the path.

+ 1 - 1
.github/workflows/run_test_case.yaml

@@ -12,7 +12,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: golang:1.13
+            image: golang:1.14
 
         steps:
         - uses: actions/checkout@v2

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13.10 AS builder
+FROM golang:1.14 AS builder
 
 COPY . /go/kuiper
 

+ 2 - 2
deploy/chart/kuiper/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.5.0
+version: 0.5.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 0.5.0
+appVersion: 0.5.1

+ 1 - 1
deploy/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13.10 AS builder
+FROM golang:1.14 AS builder
 
 COPY . /go/kuiper
 

+ 2 - 2
deploy/docker/Dockerfile-alpine

@@ -1,4 +1,4 @@
-FROM golang:1.13.10-alpine AS builder
+FROM golang:1.14-alpine AS builder
 
 COPY . /go/kuiper
 
@@ -6,7 +6,7 @@ WORKDIR /go/kuiper
 
 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 \
-    && if [ "$(uname -m)" != "aarch64" ]; then apk add upx && upx ./kuiper_conf_util; fi
+    && if [ "$(uname -m)" == "x86_64" ]; then apk add upx && upx ./kuiper_conf_util; fi
 RUN make build_with_edgex
 
 FROM alpine:3.10

+ 1 - 1
deploy/docker/Dockerfile-slim

@@ -1,4 +1,4 @@
-FROM golang:1.13.10 AS builder
+FROM golang:1.14 AS builder
 
 COPY . /go/kuiper