From 164a8d37017e7186e03f91107419bd87d9c705d5 Mon Sep 17 00:00:00 2001
From: Alexander Sharov <kvendingoldo@yandex.ru>
Date: Sat, 29 Sep 2018 01:35:46 +0400
Subject: [PATCH] Rework jnlp container

---
 .../src/main/resources/Dockerfile             |  4 +--
 .../src/main/resources/Dockerfile             | 25 ++-----------------
 2 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/udc-containers/udc-backend-service/src/main/resources/Dockerfile b/udc-containers/udc-backend-service/src/main/resources/Dockerfile
index 72063016a..c48efd2c7 100644
--- a/udc-containers/udc-backend-service/src/main/resources/Dockerfile
+++ b/udc-containers/udc-backend-service/src/main/resources/Dockerfile
@@ -12,9 +12,9 @@ ENTRYPOINT ["/entrypoint.sh"]
 RUN mkdir -p ${BASE_DIR}
 
 COPY entrypoint.sh /entrypoint.sh
-RUN chmod +x /docker-entrypoint.sh
+RUN chmod +x /entrypoint.sh
 
-COPY todo.jar /udc/apps/petclinic/todo.jar
+COPY udc-backend-*.jar /udc/apps/petclinic/todo.jar
 
 LABEL project.groupid="${project.groupId}" \
       project.artifactid="${project.artifactId}" \
diff --git a/udc-containers/udc-jenkins-slave/src/main/resources/Dockerfile b/udc-containers/udc-jenkins-slave/src/main/resources/Dockerfile
index 5af468702..3860bf2e3 100644
--- a/udc-containers/udc-jenkins-slave/src/main/resources/Dockerfile
+++ b/udc-containers/udc-jenkins-slave/src/main/resources/Dockerfile
@@ -1,29 +1,8 @@
-FROM jenkinsci/jnlp-slave
-
-ENV CLOUDSDK_CORE_DISABLE_PROMPTS 1
-ENV PATH /opt/google-cloud-sdk/bin:${PATH}
-
-USER root
+FROM gcr.io/cloud-solutions-images/jenkins-k8s-slave
 
 RUN apt-get update -y
 RUN apt-get install -y jq \
       unzip \
-      maven \
-      apt-transport-https \
-      ca-certificates \
-      gnupg2 \
-      software-properties-common
+      maven
 
-RUN curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "${ID}")/gpg > /tmp/dkey; apt-key add /tmp/dkey \
- && add-apt-repository \
-    "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "${ID}") \
-    $(lsb_release -cs) \
-    stable" \
- && apt-get update \
- && apt-get -y install docker-ce
-
-RUN curl https://sdk.cloud.google.com | bash && mv google-cloud-sdk /opt
-RUN gcloud components install kubectl
 RUN curl -sfSL https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | bash
-
-USER jenkins