Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Remove GCC and related packages" #162

Merged
merged 1 commit into from
May 13, 2020
Merged

Revert "Remove GCC and related packages" #162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package/Dockerfile.dapper-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} \

ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARCH} \
GOPATH=/go GO111MODULE=on PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash GOFLAGS=-mod=vendor \
GOPROXY=https://proxy.golang.org CGO_ENABLED=0
GOPROXY=https://proxy.golang.org

# Requirements:
# Component | Usage
# -----------------------------------------------------------
# gcc | needed by `go test -race` (https://github.com/golang/go/issues/27089)
# git | find the workspace root
# curl | download other tools
# moby-engine | Dapper (Docker)
Expand All @@ -34,11 +35,10 @@ ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH=GOLANG_ARCH_${ARC
# diffutils | required for goimports
# ShellCheck | shell script linting
RUN dnf -y install --nodocs --setopt=install_weak_deps=False \
git-core curl moby-engine make golang kubernetes-client \
gcc git-core curl moby-engine make golang kubernetes-client \
findutils upx jq golang-x-tools-goimports ShellCheck shflags && \
dnf -y remove libsemanage && \
rpm -qa "selinux*" | xargs -r rpm -e --nodeps && \
rpm -e --nodeps gcc cpp binutils binutils-gold && \
dnf -y clean all && \
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin -d ${LINT_VERSION} && \
curl "https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz" | tar -xzf - && \
Expand Down