You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by je...@apache.org on 2018/08/23 03:13:11 UTC
[geode] branch develop updated: GEODE-5613: Add winrm-cli for
Windows CI support (#2364)
This is an automated email from the ASF dual-hosted git repository.
jensdeppe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new b6ba0fa GEODE-5613: Add winrm-cli for Windows CI support (#2364)
b6ba0fa is described below
commit b6ba0fa87b905eaf99fb1e8d9ef08592e309dee7
Author: Jens Deppe <jd...@pivotal.io>
AuthorDate: Wed Aug 22 20:13:03 2018 -0700
GEODE-5613: Add winrm-cli for Windows CI support (#2364)
- This also reverts the previous commit which changed the wrong docker image.
---
ci/docker/Dockerfile | 4 ----
ci/images/alpine-tools/Dockerfile | 11 ++++++++++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile
index 83978e1..c401cb6 100644
--- a/ci/docker/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -52,7 +52,6 @@ RUN chmod +x /usr/local/bin/tini \
google-cloud-sdk \
htop \
jq \
- make \
python3 \
python3-pip \
python3-setuptools \
@@ -72,9 +71,6 @@ RUN chmod +x /usr/local/bin/tini \
&& mv /opt/selenium/chromedriver /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
&& chmod 755 /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION \
&& ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver \
- && git clone https://github.com/masterzen/winrm-cli \
- && (cd winrm-cli; GOPATH=$PWD PATH=$PATH:$PWD/bin make) \
- && cp winrm-cli/bin/winrm /usr/local/bin/ \
&& ./cache_dependencies.sh \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile
index ab49980..1337fd9 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -22,11 +22,20 @@ RUN apk --no-cache add \
bash \
curl \
git \
+ go \
jq \
+ make \
+ musl-dev \
openssh-client \
+ openssl \
python \
py2-pip \
rsync \
&& 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
\ No newline at end of file
+ && gcloud config set metrics/environment github_docker_image \
+ && git clone https://github.com/masterzen/winrm-cli \
+ && (cd winrm-cli; GOPATH=$PWD PATH=$PATH:$PWD/bin make) \
+ && cp winrm-cli/bin/winrm /usr/local/bin/ \
+ && rm -rf winrm-cli \
+ && gcloud components install -q beta