!3136 修复docker启动失败的问题

Merge pull request !3136 from zhangxubo/master

docker/dockerfiles/5.0.0/dockerfile_amd

@@ -1,6 +1,6 @@
 FROM centos:7.6.1810
 
-COPY openGauss-3.0.0-CentOS-64bit.tar.bz2 .
+COPY openGauss-5.0.0-CentOS-64bit.tar.bz2 .
 COPY gosu-amd64 /usr/local/bin/gosu
 
 ENV LANG en_US.utf8
@@ -15,10 +15,10 @@ RUN set -eux; \
     mkdir -p /usr/local/opengauss && \
     mkdir -p /var/run/opengauss  && \
     mkdir /docker-entrypoint-initdb.d && \
-    tar -jxf openGauss-3.0.0-CentOS-64bit.tar.bz2 -C /usr/local/opengauss && \
+    tar -jxf openGauss-5.0.0-CentOS-64bit.tar.bz2 -C /usr/local/opengauss && \
     chown -R omm:omm /var/run/opengauss && chown -R omm:omm /usr/local/opengauss && chown -R omm:omm /var/lib/opengauss &&  chown -R omm:omm /docker-entrypoint-initdb.d && \
     chmod 2777 /var/run/opengauss && \
-    rm -rf openGauss-3.0.0-CentOS-64bit.tar.bz2 && yum clean all
+    rm -rf openGauss-5.0.0-CentOS-64bit.tar.bz2 && yum clean all
 
 RUN set -eux; \
     echo "export GAUSSHOME=/usr/local/opengauss"  >> /home/omm/.bashrc && \

docker/dockerfiles/5.0.0/dockerfile_arm

@@ -1,6 +1,6 @@
 FROM openeuler-20.03-lts:latest
 
-COPY openGauss-3.0.0-openEuler-64bit.tar.bz2 .
+COPY openGauss-5.0.0-openEuler-64bit.tar.bz2 .
 COPY gosu-arm64 /usr/local/bin/gosu
 COPY openEuler_aarch64.repo /etc/yum.repos.d/openEuler_aarch64.repo
 ENV LANG en_US.utf8
@@ -15,10 +15,10 @@ RUN set -eux; \
     mkdir -p /usr/local/opengauss && \
     mkdir -p /var/run/opengauss  && \
     mkdir /docker-entrypoint-initdb.d && \
-    tar -jxf openGauss-3.0.0-openEuler-64bit.tar.bz2 -C /usr/local/opengauss && \
+    tar -jxf openGauss-5.0.0-openEuler-64bit.tar.bz2 -C /usr/local/opengauss && \
     chown -R omm:omm /var/run/opengauss && chown -R omm:omm /usr/local/opengauss && chown -R omm:omm /var/lib/opengauss &&  chown -R omm:omm /docker-entrypoint-initdb.d && \
     chmod 2777 /var/run/opengauss && \
-    rm -rf openGauss-3.0.0-openEuler-64bit.tar.bz2 && yum clean all
+    rm -rf openGauss-5.0.0-openEuler-64bit.tar.bz2 && yum clean all
 
 RUN set -eux; \
     echo "export GAUSSHOME=/usr/local/opengauss"  >> /home/omm/.bashrc && \

docker/dockerfiles/5.0.0/entrypoint.sh

@@ -308,13 +308,8 @@ docker_temp_server_start() {
                 shift
         fi
 
-        # internal start of server in order to allow setup using gsql client
-        # does not listen on external TCP/IP and waits until start finishes
-        set -- "$@" -c "listen_addresses='*'" -p "${PGPORT:-5432}"
-
         PGUSER="${PGUSER:-$GS_USER}" \
         gs_ctl -D "$PGDATA" \
-                -o "$(printf '%q ' "$@")" \
                 -w start
 }
 

docker/dockerfiles/buildDockerImage.sh

@@ -84,7 +84,7 @@ check_docker_version() {
 ##############
 
 # Parameters
-VERSION="1.0.0"
+VERSION="5.0.0"
 SKIPCHECKSUM=0
 DOCKEROPS=""
 MIN_DOCKER_VERSION="17.09"

docker/dockerfiles/create_master_slave.sh

@@ -64,8 +64,8 @@ read -p "Please input SLAVE_NODENAME [opengauss_slave1]: " SLAVE_NODENAME
 SLAVE_NODENAME=${SLAVE_NODENAME:-opengauss_slave1}
 echo "SLAVE_NODENAME set $SLAVE_NODENAME"
 
-read -p "Please input openGauss VERSION [1.0.1]: " VERSION
+read -p "Please input openGauss VERSION [5.0.0]: " VERSION
-VERSION=${VERSION:-1.0.1}
+VERSION=${VERSION:-5.0.0}
 echo "openGauss VERSION set $VERSION"
 
 echo "starting  "