[GitHub] little-cui closed pull request #504: SCB-1059 Support go 1.11.2

[GitBox <gi...@apache.org>]

little-cui closed pull request #504: SCB-1059 Support go 1.11.2
URL: https://github.com/apache/servicecomb-service-center/pull/504
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/Dockerfile.build b/Dockerfile.build
index 764c0292..b52efa7e 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -13,10 +13,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.9.2
+FROM golang:1.11.2
 
 WORKDIR /go/src/github.com/apache/servicecomb-service-center
 
 COPY . .
 
-RUN bash -x scripts/build/local.sh linux 1.0.0 latest
+RUN bash -x scripts/build/local.sh linux 1.1.0 latest
diff --git a/scripts/build/local.sh b/scripts/build/local.sh
index 2ae7cd98..869627aa 100644
--- a/scripts/build/local.sh
+++ b/scripts/build/local.sh
@@ -21,7 +21,7 @@ export GOOS=${1:-"linux"}
 export GOARCH=${4:-"amd64"}
 export CGO_ENABLED=${CGO_ENABLED:-0} # prevent to compile cgo file
 export GO_EXTLINK_ENABLED=${GO_EXTLINK_ENABLED:-0} # do not use host linker
-export GO_LDFLAGS=${GO_LDFLAGS:-"-linkmode 'external' -extldflags '-static' -s -w"}
+export GO_LDFLAGS=${GO_LDFLAGS:-" -s -w"}
 
 RELEASE=${2:-"0.0.1"}
 
diff --git a/scripts/docker/build-frontend-image/build.sh b/scripts/docker/build-frontend-image/build.sh
index 8774c078..d64912b9 100644
--- a/scripts/docker/build-frontend-image/build.sh
+++ b/scripts/docker/build-frontend-image/build.sh
@@ -48,7 +48,7 @@ cp -rp $PACKAGE_DIR/app $PACKAGE_DIR/conf $PACKAGE_DIR/frontend start.sh fronten
 chmod 500 frontend/start.sh frontend/frontend
 
 # store the base image name and version
-BASE_IMAGE=${BASE_IMAGE:-"ubuntu"}
+BASE_IMAGE=${BASE_IMAGE:-"alpine"}
 
 BASE_IMAGE_VERSION=${BASE_IMAGE_VERSION:-"latest"}
 
diff --git a/scripts/docker/build-image/build.sh b/scripts/docker/build-image/build.sh
index 9ede4370..7ba7d9f1 100644
--- a/scripts/docker/build-image/build.sh
+++ b/scripts/docker/build-image/build.sh
@@ -48,7 +48,7 @@ cp -rp $PACKAGE_DIR/conf $PACKAGE_DIR/service-center start.sh service-center
 chmod 500 service-center/start.sh service-center/service-center
 
 # store the base image name and version
-BASE_IMAGE=${BASE_IMAGE:-"ubuntu"}
+BASE_IMAGE=${BASE_IMAGE:-"alpine"}
 
 BASE_IMAGE_VERSION=${BASE_IMAGE_VERSION:-"latest"}
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services