diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e5c1ca292..fbed8c178 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,10 +15,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Go 1.14 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.16 - name: Test source code run: script/test-source diff --git a/.github/workflows/system.yml b/.github/workflows/system.yml index 9c4628e67..b19c3c8a7 100644 --- a/.github/workflows/system.yml +++ b/.github/workflows/system.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.16 - name: check out uses: actions/checkout@v2 diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml index 55af2b02b..44679a7bc 100644 --- a/.github/workflows/upgrade.yml +++ b/.github/workflows/upgrade.yml @@ -11,10 +11,10 @@ jobs: # backend: [sqlite, MySQL] steps: - - name: Set up Go 1.14 + - name: Set up Go 1.16 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.16 - name: Start local MySQL run: sudo /etc/init.d/mysql start diff --git a/build.sh b/build.sh index 1e8946f6a..02d1cb89f 100755 --- a/build.sh +++ b/build.sh @@ -84,8 +84,8 @@ function precheck() { ok=1 fi - if ! go version | egrep -q 'go(1\.1[456])' ; then - echo "go version must be 1.14 or above" + if ! go version | egrep -q 'go(1\.1[6789])' ; then + echo "go version must be 1.16 or above" ok=1 fi diff --git a/docker/Dockerfile b/docker/Dockerfile index 530f7a375..7fb2d0ba4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ # ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server # ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server -FROM golang:1.14.4-alpine3.12 as build +FROM golang:1.16.6-alpine3.14 as build ENV GOPATH=/tmp/go @@ -28,7 +28,7 @@ RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator -maxde RUN rsync -av $(find /tmp/orchestrator-release -type d -name orchestrator-client -maxdepth 2)/ / RUN cp conf/orchestrator-sample-sqlite.conf.json /etc/orchestrator.conf.json -FROM alpine:3.8 +FROM alpine:3.14 RUN apk --no-cache add bash curl jq diff --git a/docker/Dockerfile.packaging b/docker/Dockerfile.packaging index 214734cf7..29a651383 100644 --- a/docker/Dockerfile.packaging +++ b/docker/Dockerfile.packaging @@ -14,7 +14,7 @@ # ORC_USER (default: orc_server_user): username used to login to orchestrator backend MySQL server # ORC_PASSWORD (default: orc_server_password): password used to login to orchestrator backend MySQL server -FROM golang:1.14.4-stretch +FROM golang:1.16.6-stretch RUN apt-get update RUN apt-get install -y ruby ruby-dev rubygems build-essential diff --git a/docker/Dockerfile.raft b/docker/Dockerfile.raft index 284d98ceb..91b898f15 100644 --- a/docker/Dockerfile.raft +++ b/docker/Dockerfile.raft @@ -1,4 +1,4 @@ -FROM golang:1.14.4-stretch +FROM golang:1.16.6-stretch LABEL maintainer="openark@github.com" RUN apt-get update -q -y diff --git a/docker/Dockerfile.system b/docker/Dockerfile.system index 3fe924c9f..f06e6dda7 100644 --- a/docker/Dockerfile.system +++ b/docker/Dockerfile.system @@ -1,4 +1,4 @@ -FROM golang:1.14.4-stretch +FROM golang:1.16.6-stretch LABEL maintainer="openark@github.com" RUN apt-get update -q -y diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index 369a004e0..65f34195d 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -1,4 +1,4 @@ -FROM golang:1.14.4-stretch +FROM golang:1.16.6-stretch LABEL maintainer="openark@github.com" RUN apt-get update diff --git a/script/ensure-go-installed b/script/ensure-go-installed index b3c05fc23..407c1baf6 100755 --- a/script/ensure-go-installed +++ b/script/ensure-go-installed @@ -1,7 +1,7 @@ #!/bin/bash -PREFERRED_GO_VERSION=go1.14.4 -SUPPORTED_GO_VERSIONS='go1.1[456]' +PREFERRED_GO_VERSION=go1.16.6 +SUPPORTED_GO_VERSIONS='go1.1[6789]' export ROOTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )" cd $ROOTDIR