You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by sm...@apache.org on 2021/04/14 21:48:14 UTC

[geode] branch support/1.13 updated: GEODE-9153: Fix alpine-tools docker image (#6321)

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

smgoller 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 25d42c7  GEODE-9153: Fix alpine-tools docker image (#6321)
25d42c7 is described below

commit 25d42c721dd3d3e5d5ffbf45b23e1f7b1e46d1be
Author: Sean Goller <se...@goller.net>
AuthorDate: Wed Apr 14 14:36:32 2021 -0700

    GEODE-9153: Fix alpine-tools docker image (#6321)
    
    * Use same image for builder as deployment
    * Add py3-yaml package so python doesn't try to build it.
---
 ci/images/alpine-tools/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/images/alpine-tools/Dockerfile b/ci/images/alpine-tools/Dockerfile
index 912d6fb..f476e0e 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine:latest as winrm-builder
+FROM bellsoft/liberica-openjdk-alpine:8 as winrm-builder
 RUN apk --no-cache add \
     git \
     go \
@@ -38,6 +38,7 @@ RUN apk --no-cache add \
       openssl \
       python3 \
       py3-pip \
+      py3-yaml \
       rsync \
       util-linux \
   && gcloud config set core/disable_usage_reporting true \