From 8ac7db46e0176fd737c9d9393010a4b262891554 Mon Sep 17 00:00:00 2001 From: Ta-Ching Chen Date: Mon, 27 Jan 2020 20:07:39 +0800 Subject: [PATCH] Add Go 1.13 support and upgrade Go 1.12 version (#1507) --- environments/go/Dockerfile-1.12 | 2 +- environments/go/Dockerfile-1.13 | 24 ++++++++++++++++++++++++ environments/go/builder/Dockerfile-1.12 | 2 +- environments/go/builder/Dockerfile-1.13 | 14 ++++++++++++++ hack/release-build.sh | 2 ++ hack/release.sh | 2 ++ 6 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 environments/go/Dockerfile-1.13 create mode 100644 environments/go/builder/Dockerfile-1.13 diff --git a/environments/go/Dockerfile-1.12 b/environments/go/Dockerfile-1.12 index ab866217..c5c934d5 100644 --- a/environments/go/Dockerfile-1.12 +++ b/environments/go/Dockerfile-1.12 @@ -1,4 +1,4 @@ -ARG GO_VERSION=1.12.7 +ARG GO_VERSION=1.12 FROM ubuntu:18.04 AS base WORKDIR / diff --git a/environments/go/Dockerfile-1.13 b/environments/go/Dockerfile-1.13 new file mode 100644 index 00000000..5542bdc5 --- /dev/null +++ b/environments/go/Dockerfile-1.13 @@ -0,0 +1,24 @@ +ARG GO_VERSION=1.13 + +FROM ubuntu:18.04 AS base +WORKDIR / +RUN apt update && apt install -y ca-certificates && rm -rf /var/lib/apt/lists/* + +FROM golang:${GO_VERSION} AS builder + +ENV GOPATH /usr +ENV APP ${GOPATH}/src/github.com/fission/fission/environments/go + +WORKDIR ${APP} + +ADD context ${APP}/context +ADD server.go ${APP} + +RUN go get +RUN go build -a -o /server server.go + +FROM base +COPY --from=builder /server / + +ENTRYPOINT ["/server"] +EXPOSE 8888 diff --git a/environments/go/builder/Dockerfile-1.12 b/environments/go/builder/Dockerfile-1.12 index 9419cd53..e30415c7 100644 --- a/environments/go/builder/Dockerfile-1.12 +++ b/environments/go/builder/Dockerfile-1.12 @@ -1,5 +1,5 @@ ARG BUILDER_IMAGE=fission/builder -ARG GO_VERSION=1.12.7 +ARG GO_VERSION=1.12 FROM ${BUILDER_IMAGE} diff --git a/environments/go/builder/Dockerfile-1.13 b/environments/go/builder/Dockerfile-1.13 new file mode 100644 index 00000000..144f5a7d --- /dev/null +++ b/environments/go/builder/Dockerfile-1.13 @@ -0,0 +1,14 @@ +ARG BUILDER_IMAGE=fission/builder +ARG GO_VERSION=1.13 + +FROM ${BUILDER_IMAGE} + +FROM golang:${GO_VERSION} + +ENV GOPATH /usr +ENV GO111MODULE on +WORKDIR ${GOPATH} + +COPY --from=0 /builder /builder +ADD build.sh /usr/local/bin/build + diff --git a/hack/release-build.sh b/hack/release-build.sh index 46893a53..f65bd08c 100755 --- a/hack/release-build.sh +++ b/hack/release-build.sh @@ -139,6 +139,7 @@ build_all_envs() { build_env_image "$version" "go" "go-env" "" build_env_image "$version" "go" "go-env" "1.11.4" build_env_image "$version" "go" "go-env" "1.12" + build_env_image "$version" "go" "go-env" "1.13" build_env_image "$version" "perl" "perl-env" "" build_env_image "$version" "php7" "php-env" "" build_env_image "$version" "python" "python-env" "" @@ -182,6 +183,7 @@ build_all_env_builders() { build_env_builder_image "$version" "go" "go-builder" "" build_env_builder_image "$version" "go" "go-builder" "1.11.4" build_env_builder_image "$version" "go" "go-builder" "1.12" + build_env_builder_image "$version" "go" "go-builder" "1.13" build_env_builder_image "$version" "jvm" "jvm-builder" "" build_env_builder_image "$version" "nodejs" "node-builder" "" build_env_builder_image "$version" "php7" "php-builder" "" diff --git a/hack/release.sh b/hack/release.sh index e53c95d9..a4fafa5c 100755 --- a/hack/release.sh +++ b/hack/release.sh @@ -81,6 +81,7 @@ push_all_envs() { push_env_image "$version" "go" "go-env" "" push_env_image "$version" "go" "go-env" "1.11.4" push_env_image "$version" "go" "go-env" "1.12" + push_env_image "$version" "go" "go-env" "1.13" push_env_image "$version" "perl" "perl-env" "" push_env_image "$version" "php7" "php-env" "" push_env_image "$version" "python" "python-env" "" @@ -120,6 +121,7 @@ push_all_env_builders() { push_env_builder_image "$version" "go" "go-builder" "" push_env_builder_image "$version" "go" "go-builder" "1.11.4" push_env_builder_image "$version" "go" "go-builder" "1.12" + push_env_builder_image "$version" "go" "go-builder" "1.13" push_env_builder_image "$version" "jvm" "jvm-builder" "" push_env_builder_image "$version" "nodejs" "node-builder" "" push_env_builder_image "$version" "ruby" "ruby-builder" ""