[geode] branch support/1.13 updated: GEODE-8146: use latest winrm in tools image (#5134)

[on...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/support/1.13 by this push:
     new 447dc1a  GEODE-8146: use latest winrm in tools image (#5134)
447dc1a is described below

commit 447dc1a135e43538a915f812780536844bd00133
Author: Robert Houghton <rh...@pivotal.io>
AuthorDate: Thu May 21 13:12:25 2020 -0700

    GEODE-8146: use latest winrm in tools image (#5134)
    
    * Built cleanly in multistage build
    * Moved from python2 -> python3
    * Pin concourse-pipeline resource
    
    Authored-by: Robert Houghton <rh...@pivotal.io>
    (cherry picked from commit f2392d0403a292f8e85c5d466329bce5f0d5b819)
---
 ci/images/alpine-tools/Dockerfile    | 22 ++++++++++++----------
 ci/pipelines/meta/jinja.template.yml |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile
index 4028523..5bb41da 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -13,8 +13,17 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
+FROM alpine:latest as winrm-builder
+RUN apk --no-cache add \
+    git \
+    go \
+    musl-dev \
+  && go get -v github.com/masterzen/winrm-cli
+
 FROM openjdk:8-jdk-alpine
 
+COPY --from=winrm-builder /root/go/bin/winrm-cli /usr/local/bin/winrm
 COPY --from=google/cloud-sdk:alpine /google-cloud-sdk /google-cloud-sdk
 #COPY --from=hashicorp/packer:latest /bin/packer /usr/local/bin/packer
 COPY --from=hashicorp/packer:1.4.5 /bin/packer /usr/local/bin/packer
@@ -23,24 +32,17 @@ RUN apk --no-cache add \
       bash \
       curl \
       git \
-      go \
       jq \
-      make \
       musl-dev \
       openssh-client \
       openssl \
-      python \
-      py2-pip \
+      python3 \
+      py3-pip \
       rsync \
       util-linux \
   && gcloud config set core/disable_usage_reporting true \
   && gcloud config set component_manager/disable_update_check true \
   && gcloud config set metrics/environment github_docker_image \
-  && git clone https://github.com/masterzen/winrm-cli \
-  && (cd winrm-cli; git reset --hard 6f0c57dee4569c04f64c44c335752b415e5d73a7 ; GOPATH=$PWD PATH=$PATH:$PWD/bin make) \
-  && cp winrm-cli/bin/winrm /usr/local/bin/ \
-  && rm -rf winrm-cli \
   && gcloud components install -q beta \
   && printf "Host *\n  ServerAliveInterval 60 \n  ServerAliveCountMax 2\n" >> /etc/ssh/ssh_config \
-  && pip2 install awscli \
-  && apk --no-cache del go make
+  && pip3 install awscli
diff --git a/ci/pipelines/meta/jinja.template.yml b/ci/pipelines/meta/jinja.template.yml
index 83eccc4..5fd8ee3 100644
--- a/ci/pipelines/meta/jinja.template.yml
+++ b/ci/pipelines/meta/jinja.template.yml
@@ -23,6 +23,7 @@ resource_types:
   type: docker-image
   source:
     repository: concourse/concourse-pipeline-resource
+    tag: 2.2.0
 
 resources:
 - name: concourse