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

Jump to bottom

Split out cleanups from #10806 #10823

Merged
merged 3 commits into from Apr 2, 2020
Merged

Split out cleanups from #10806 #10823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b0bbd0
make: don't list all Go files for `ineffassign` target in quiet mode
tklauser Apr 1, 2020
5d3dda1
docs: reformat table with development requirements
tklauser Apr 1, 2020
ab4ffca
Dockerfile.builder: use go get path@version syntax to download ineffa…
tklauser Apr 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ FROM quay.io/cilium/cilium-envoy:a3385205ad620550b35d3b0b651e40898386e6e3 as cil
# versions to be built while allowing the new versions to make changes
# that are not backwards compatible.
#
FROM quay.io/cilium/cilium-builder:2020-03-21 as builder
FROM quay.io/cilium/cilium-builder:2020-04-02 as builder
LABEL maintainer="maintainer@cilium.io"
WORKDIR /go/src/github.com/cilium/cilium
COPY . ./
Expand Down
8 changes: 3 additions & 5 deletions Dockerfile.builder
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ ENV GO_VERSION 1.14.1
#
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y --no-install-recommends \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
apt-utils \
binutils \
ca-certificates \
Expand Down Expand Up @@ -53,7 +53,5 @@ RUN apt-get update \
# Install Go
#
RUN curl -sfL https://dl.google.com/go/go${GO_VERSION}.linux-amd64.tar.gz | tar -xzC /usr/local && \
go get -d -u github.com/gordonklaus/ineffassign && \
cd /go/src/github.com/gordonklaus/ineffassign && \
git checkout -b 1003c8bd00dc2869cb5ca5282e6ce33834fed514 1003c8bd00dc2869cb5ca5282e6ce33834fed514 && \
go install
GO111MODULE=on go get github.com/gordonklaus/ineffassign@1003c8bd00dc2869cb5ca5282e6ce33834fed514 && \
go clean -cache -modcache
50 changes: 25 additions & 25 deletions Documentation/contributing/development/dev_setup.rst
View file
Open in desktop
Expand Up @@ -15,31 +15,31 @@ Requirements
You need to have the following tools available in order to effectively
contribute to Cilium:

+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
| Dependency | Version / Commit ID | Download Command |
+==================================================================================+=============================+===============================================================================+
| git | latest | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
| clang | >= 7.0 (latest recommended) | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
| llvm | >= 7.0 (latest recommended) | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
| libelf-devel | latest | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
| `go <https://golang.org/dl/>`_ | |GO_RELEASE| | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+ `ginkgo <https://github.com/onsi/ginkgo>`__ | >= 1.4.0 | ``go get -u github.com/onsi/ginkgo/ginkgo`` |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+ `gomega <https://github.com/onsi/gomega>`_ | >= 1.2.0 | ``go get -u github.com/onsi/gomega`` |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+ `ineffassign <https://github.com/gordonklaus/ineffassign>`_ | >= ``1003c8b`` | ``go get -u github.com/gordonklaus/ineffassign`` |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+ `Docker <https://docs.docker.com/engine/installation/>`_ | OS-Dependent | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+ `Docker-Compose <https://docs.docker.com/compose/install/>`_ | OS-Dependent | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+ python3-pip | latest | N/A (OS-specific) |
+----------------------------------------------------------------------------------+-----------------------------+-------------------------------------------------------------------------------+
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
| Dependency | Version / Commit ID | Download Command |
+==============================================================+=============================+==================================================+
| git | latest | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
| clang | >= 7.0 (latest recommended) | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
| llvm | >= 7.0 (latest recommended) | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
| libelf-devel | latest | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
| `go <https://golang.org/dl/>`_ | |GO_RELEASE| | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
+ `ginkgo <https://github.com/onsi/ginkgo>`__ | >= 1.4.0 | ``go get -u github.com/onsi/ginkgo/ginkgo`` |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
+ `gomega <https://github.com/onsi/gomega>`_ | >= 1.2.0 | ``go get -u github.com/onsi/gomega`` |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
+ `ineffassign <https://github.com/gordonklaus/ineffassign>`_ | >= ``1003c8b`` | ``go get -u github.com/gordonklaus/ineffassign`` |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
+ `Docker <https://docs.docker.com/engine/installation/>`_ | OS-Dependent | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
+ `Docker-Compose <https://docs.docker.com/compose/install/>`_ | OS-Dependent | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+
+ python3-pip | latest | N/A (OS-specific) |
+--------------------------------------------------------------+-----------------------------+--------------------------------------------------+

For `unit_testing`, you will need to run ``docker`` without privileges. You can usually achieve this by adding your current user to the ``docker`` group.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -379,7 +379,7 @@ govet:
./tools/...

ineffassign:
@$(ECHO_CHECK) $(GOFILES)
@$(ECHO_CHECK) ineffassign
$(QUIET) ineffassign .

logging-subsys-field:
Expand Down
2 changes: 1 addition & 1 deletion test/docker-compose.yml
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ services:
command: "etcd -name etcd0 -advertise-client-urls http://0.0.0.0:4002 -listen-client-urls http://0.0.0.0:4002 -initial-cluster-token etcd-cluster-1 -initial-cluster-state new"
privileged: true
base_image:
image: "quay.io/cilium/cilium-builder:2020-02-26"
image: "quay.io/cilium/cilium-builder:2020-04-02"
volumes:
- "./../:/go/src/github.com/cilium/cilium/"
privileged: true
Expand Down