Skip to content

Commit 3ba8321

Browse files
fix(git): Remove git version constraints in distro package (spinnaker#5308)
1 parent bf1bdce commit 3ba8321

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

.idea/compiler.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.slim

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ENV AWS_CLI_S3_CMD=2.0.2
88
ENV AWS_AIM_AUTHENTICATOR_VERSION=0.4.0
99
ENV GOOGLE_CLOUD_SDK_VERSION=313.0.1
1010
ENV ECR_TOKEN_VERSION=v1.0.2
11-
ENV GIT_VERSION=2.26.3-r0
1211

1312
ENV PATH "$PATH:/usr/local/bin/:/opt/google-cloud-sdk/bin/:/usr/local/bin/aws-iam-authenticator"
1413

@@ -19,7 +18,7 @@ RUN apk update \
1918
ca-certificates \
2019
wget \
2120
openjdk11 \
22-
"git=$GIT_VERSION" \
21+
git \
2322
openssh-client
2423

2524
# AWS CLI

Dockerfile.ubuntu

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM ubuntu:bionic
22
LABEL maintainer="[email protected]"
33

4-
ENV GIT_VERSION=1:2.17.1-1ubuntu0.7
5-
64
RUN apt-get update && apt-get install -y curl gnupg && \
75
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
86
echo "deb https://packages.cloud.google.com/apt cloud-sdk-bionic main" > /etc/apt/sources.list.d/cloud-sdk.list && \
@@ -16,7 +14,7 @@ RUN apt-get update && apt-get install -y curl gnupg && \
1614
google-cloud-sdk-app-engine-go \
1715
kubectl \
1816
python-pip \
19-
"git=$GIT_VERSION" \
17+
git \
2018
openssh-client && \
2119
pip install awscli==1.18.152 --upgrade && \
2220
rm -rf ~/.config/gcloud

0 commit comments

Comments
 (0)