Merge pull request #29 from Percona-Lab/PMM-12549-improve-dockerfile

PMM-12549 improve Dockerfile

pmm_psmdb-pbm_setup/Dockerfile

@@ -59,12 +59,13 @@ RUN set -ex; \
         cd /tmp/pmm2-client && ./install_tarball && cd ../ && rm -rf pmm2* ;\
     elif [ $PMM_CLIENT_VERSION == "latest" ]; then \
         yum -y install pmm2-client ; \
+    elif [ $PMM_CLIENT_VERSION == "pmm2-rc" ]; then \
+        percona-release enable original testing \
+        yum update --refresh -y \
+        yum -y install pmm2-client ; \
     else \
         yum -y install pmm2-client-${PMM_CLIENT_VERSION}-6.el8 ; \
     fi && \
-    if [ -f "/usr/bin/mongosh" ] ; then \
-        ln -s /usr/bin/mongosh /usr/bin/mongo ; \
-    fi && \
     systemctl enable mongod && \
     systemctl enable pbm-agent && \
     systemctl enable pmm-agent && \
@@ -75,5 +76,6 @@ RUN set -ex; \
 
 COPY conf/sysconfig/mongod /etc/sysconfig/
 COPY keyfile /etc/keyfile
+RUN ln -s /usr/bin/mongosh /usr/bin/mongo || true
 RUN chown mongod /etc/keyfile && chmod 400 /etc/keyfile
 EXPOSE 27017

pmm_psmdb-pbm_setup/start-rs-only.sh

@@ -12,7 +12,7 @@ docker network create pmm2-ui-tests_pmm-network || true
 export COMPOSE_PROFILES=${profile}
 
 docker-compose -f docker-compose-rs.yaml down -v --remove-orphans
-docker-compose -f docker-compose-rs.yaml build
+docker-compose -f docker-compose-rs.yaml build --no-cache
 docker-compose -f docker-compose-rs.yaml up -d
 echo
 echo "waiting 30 seconds for replica set members to start"