Skip to content

Commit dbf743c

Browse files
committed
fix(docker-go-dev): fix helm make error
1 parent 649288f commit dbf743c

2 files changed

Lines changed: 7 additions & 21 deletions

File tree

rootfs/Dockerfile

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ LABEL name="drycc-go-dev"
55
ENV AZCLI_VERSION=2.9.1 \
66
DOCKER_VERSION=18.09 \
77
GO_VERSION=1.14.6 \
8-
HELM_VERSION=v2.16.9 \
8+
HELM_VERSION=v3.2.4 \
99
KUBECTL_VERSION=v1.18.6 \
1010
SHELLCHECK_VERSION=v0.7.1 \
1111
ETCDCTL_VERSION=v3.4.10 \
@@ -35,10 +35,9 @@ RUN \
3535
netcat \
3636
openssh-client \
3737
procps \
38-
python \
39-
python-dev \
40-
python-pip \
41-
python-setuptools \
38+
python3 \
39+
python3-dev \
40+
python3-pip \
4241
rsync \
4342
ruby \
4443
unzip \
@@ -56,9 +55,6 @@ RUN \
5655
&& curl -L https://storage.googleapis.com/golang/go$GO_VERSION.linux-amd64.tar.gz | tar -C /usr/local -xz \
5756
&& curl -L https://storage.googleapis.com/k8s-claimer/git-e4dcc16/k8s-claimer-git-e4dcc16-linux-amd64 -o /usr/local/bin/k8s-claimer \
5857
&& chmod +x /usr/local/bin/k8s-claimer \
59-
&& curl -sSL -o /tmp/protoc.zip https://github.com/google/protobuf/releases/download/v3.1.0/protoc-3.1.0-linux-x86_64.zip \
60-
&& unzip /tmp/protoc.zip 'bin/protoc' -d /usr/local \
61-
&& rm /tmp/protoc.zip \
6258
&& curl -sSL https://storage.googleapis.com/kubernetes-release/release/$KUBECTL_VERSION/bin/linux/amd64/kubectl -o /usr/local/bin/kubectl \
6359
&& chmod +x /usr/local/bin/kubectl \
6460
&& mkdir -p $GOPATH/src/k8s.io/helm \
@@ -93,8 +89,8 @@ RUN \
9389
&& ln -s ${GOPATH}/bin/gometalinter.v2 ${GOPATH}/bin/gometalinter \
9490
&& gometalinter.v2 --install \
9591
&& curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $GOPATH/bin $GOLANGCI_LINT_VERSION \
96-
&& pip install --disable-pip-version-check --no-cache-dir azure-cli==${AZCLI_VERSION} shyaml \
97-
&& apt-get purge --auto-remove -y libffi-dev python-dev python-pip \
92+
&& pip3 install --disable-pip-version-check --no-cache-dir azure-cli==${AZCLI_VERSION} shyaml \
93+
&& apt-get purge --auto-remove -y libffi-dev python3-dev python3-pip \
9894
&& apt-get autoremove -y \
9995
&& apt-get clean -y \
10096
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/man /usr/share/doc

rootfs/usr/local/bin/test-cover.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,4 @@
33
set -euo pipefail
44
IFS=$'\n\t'
55

6-
# shellcheck disable=SC2046
7-
pkgs=$(go list $(glide novendor))
8-
9-
echo "" > coverage.txt
10-
for p in $pkgs; do
11-
go test -covermode=atomic -coverprofile=profile.out "$p"
12-
if [ -s profile.out ]; then
13-
cat profile.out >> coverage.txt
14-
fi
15-
rm -f profile.out
16-
done
6+
go test --coverage=atomic -coverprofile=coverage.txt ./...

0 commit comments

Comments
 (0)