This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-service-center.git
The following commit(s) were added to refs/heads/master by this push:
new 307132e SCB-1059 Support go 1.11.2 (#504)
307132e is described below
commit 307132ecc5e5d7995b79037f144208fe0ee4000a
Author: little-cui <[email protected]>
AuthorDate: Mon Dec 3 19:35:18 2018 +0800
SCB-1059 Support go 1.11.2 (#504)
---
Dockerfile.build | 4 ++--
scripts/build/local.sh | 2 +-
scripts/docker/build-frontend-image/build.sh | 2 +-
scripts/docker/build-image/build.sh | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Dockerfile.build b/Dockerfile.build
index 764c029..b52efa7 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 2ae7cd9..869627a 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 8774c07..d64912b 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 9ede437..7ba7d9f 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"}
