This is an automated email from the ASF dual-hosted git repository.
dixie 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 5e09c5a GEODE-10145: Organize Dockerfile to work around alpine compat
issues (#7466)
5e09c5a is described below
commit 5e09c5ab15ca82ee078889385ae2a81af341d5f9
Author: Robert Houghton <[email protected]>
AuthorDate: Mon Mar 21 15:39:03 2022 -0700
GEODE-10145: Organize Dockerfile to work around alpine compat issues (#7466)
Also add concourse resources to track our base-image versions to better
track which dependencies may have caused the build issue. Still only
triggering on the core base image, and our Dockerfile.
Authored-by: Robert Houghton <[email protected]>
(cherry picked from commit 07a1aacc9275e028b0ab8dd57193f423f8f722c3)
---
ci/images/alpine-tools/Dockerfile | 19 +++++++++++++-----
ci/pipelines/images/jinja.template.yml | 35 ++++++++++++++++++++++++++++++++--
2 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/ci/images/alpine-tools/Dockerfile
b/ci/images/alpine-tools/Dockerfile
index f476e0e..f37181f 100644
--- a/ci/images/alpine-tools/Dockerfile
+++ b/ci/images/alpine-tools/Dockerfile
@@ -14,36 +14,45 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM bellsoft/liberica-openjdk-alpine:8 as winrm-builder
+FROM alpine:3.14 as winrm-builder
RUN apk --no-cache add \
git \
go \
musl-dev \
&& go get -v github.com/masterzen/winrm-cli
-FROM bellsoft/liberica-openjdk-alpine:8
+FROM google/cloud-sdk: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
-ENV PATH /google-cloud-sdk/bin:$PATH
+
RUN apk --no-cache add \
bash \
curl \
git \
jq \
- musl-dev \
openssh-client \
openssl \
python3 \
+ py3-crcmod \
+ py3-openssl \
py3-pip \
py3-yaml \
rsync \
util-linux \
+ wget \
+ && echo "https://apk.bell-sw.com/main"; | tee -a /etc/apk/repositories \
+ && wget -P /etc/apk/keys/
https://apk.bell-sw.com/[email protected] \
+ && apk add --no-cache \
+ bellsoft-java8 \
+ && apk del \
+ wget \
&& 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 \
&& gcloud components install -q beta \
&& printf "Host *\n ServerAliveInterval 60 \n ServerAliveCountMax 2\n" >>
/etc/ssh/ssh_config \
&& pip3 install awscli
+
+ENV JAVA_HOME /usr/lib/jvm/default-jvm
diff --git a/ci/pipelines/images/jinja.template.yml
b/ci/pipelines/images/jinja.template.yml
index 9b3ee7f..3afdf12 100644
--- a/ci/pipelines/images/jinja.template.yml
+++ b/ci/pipelines/images/jinja.template.yml
@@ -65,6 +65,34 @@ resources:
repository: bellsoft/liberica-openjdk-debian
tag: 8
+- name: packer-145-image
+ icon: docker
+ type: registry-image
+ source:
+ registry_mirror:
+ host: mirror.gcr.io
+ repository: hashicorp/packer
+ tag: 1.4.5
+
+- name: gcloud-sdk-image
+ icon: docker
+ type: registry-image
+ source:
+ registry_mirror:
+ host: mirror.gcr.io
+ repository: google/cloud-sdk
+ tag: alpine
+
+# Base image for full-regression-runner
+- name: alpine-314-image
+ icon: docker
+ type: registry-image
+ source:
+ registry_mirror:
+ host: mirror.gcr.io
+ repository: alpine
+ tag: 3.14
+
- name: google-geode-builder
type: git
source:
@@ -325,10 +353,13 @@ jobs:
serial: true
plan:
- in_parallel:
- - get: alpine-docker-image
- trigger: true
- get: alpine-tools-dockerfile
trigger: true
+ # Base images, used for tracking
+ - get: gcloud-sdk-image
+ trigger: true
+ - get: packer-145-image
+ - get: alpine-314-image
- put: alpine-tools-docker-image
params:
build: alpine-tools-dockerfile/ci/images/alpine-tools
