Tomishinets Vladimir 4 vuotta sitten
vanhempi
commit
8cf4433e08
2 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 1
      Dockerfile
  2. 0 1
      devK8s.Jenkinsfile

+ 2 - 1
Dockerfile

@@ -18,7 +18,8 @@ ARG memcached_version=2.3.2
 ARG spymemcached_version=2.12.3
 RUN set -x \
            && curl https://repo.infoclinica.ru/yum/centos/sds-${repo}-${version}.repo -o /etc/yum.repos.d/sds-${repo}-${version}.repo \
-           && yum install -y iputils tomcat-8.0.26-01 web-laboratory \
+           && yum install -y iputils tomcat-8.0.26-01 \
+           && yum install -y web-laboratory \
            && yum clean all \
            && chmod +x /entrypoint.sh /healthcheck.sh \
            && curl https://repo1.maven.org/maven2/de/javakaffee/msm/memcached-session-manager/${memcached_version}/memcached-session-manager-${memcached_version}.jar -o /opt/tomcat/lib/memcached-session-manager-${memcached_version}.jar \

+ 0 - 1
devK8s.Jenkinsfile

@@ -60,7 +60,6 @@ pipeline {
           REGISTRY = "${DOCKER_REGISTRY}/${DOCKER_IMAGE}"
           ARGS = [ "repo=${repo}", "version=${version}" ]
           TAG = "${repo}-${BUILD_NUMBER}"
-          sh "ls -al"
           k8sBuildImage.kaniko(REGISTRY, TAG, ARGS)
         }
       }