aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/build_docker_image.sh9
-rw-r--r--distributions/msb-apigateway/src/main/basedocker/Dockerfile7
2 files changed, 15 insertions, 1 deletions
diff --git a/ci/build_docker_image.sh b/ci/build_docker_image.sh
index 45ac274..5d94507 100644
--- a/ci/build_docker_image.sh
+++ b/ci/build_docker_image.sh
@@ -22,7 +22,14 @@ if [[ ${NAME} && ${VERSION} && ${DIR} ]]; then
echo "assign the x to all files and dirs under current dir.."
chmod +x -R .
echo "begin to build image ${NAME}.."
- docker build --no-cache -t ${NAME}:${VERSION} . >/dev/null || { echo -e "\nBuild docker image failed!";exit 1; }
+ build_args=""
+ if [ $http_proxy ]; then
+ build_args+=" --build-arg http_proxy=$http_proxy"
+ fi
+ if [ $https_proxy ]; then
+ build_args+=" --build-arg https_proxy=$https_proxy"
+ fi
+ docker build --no-cache -t ${NAME}:${VERSION} $build_args . >/dev/null || { echo -e "\nBuild docker image failed!";exit 1; }
docker rmi $(docker images | grep "^<none>" | awk '{print $3}') &>/dev/null
# docker save -o ${NAME}.tar ${NAME}:${VERSION} >/dev/null || { rm -f ${NAME}.tar &>/dev/null;echo -e "\nSave docker image failed!";exit 1; }
if [ ! -d ${DIR} ]; then
diff --git a/distributions/msb-apigateway/src/main/basedocker/Dockerfile b/distributions/msb-apigateway/src/main/basedocker/Dockerfile
index 02af8b1..60fbe57 100644
--- a/distributions/msb-apigateway/src/main/basedocker/Dockerfile
+++ b/distributions/msb-apigateway/src/main/basedocker/Dockerfile
@@ -1,6 +1,13 @@
# Dockerfile - msb-base
FROM openresty/openresty:alpine
+# Setup proxy variables
+ARG http_proxy
+ARG https_proxy
+
+ENV http_proxy ${http_proxy}
+ENV https_proxy ${https_proxy}
+
#install java-1.8-openjdk
ENV LANG C.UTF-8