Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
e89ab20c
Unverified
Commit
e89ab20c
authored
May 23, 2017
by
Christoph Blecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add jq and remove godep from kube-cross
parent
499d6da9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
Dockerfile
build/build-image/cross/Dockerfile
+6
-7
VERSION
build/build-image/cross/VERSION
+1
-1
No files found.
build/build-image/cross/Dockerfile
View file @
e89ab20c
...
@@ -37,7 +37,7 @@ RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${plat
...
@@ -37,7 +37,7 @@ RUN for platform in ${KUBE_CROSSPLATFORMS}; do GOOS=${platform%/*} GOARCH=${plat
# Install g++, then download and install protoc for generating protobuf output
# Install g++, then download and install protoc for generating protobuf output
RUN
apt-get update
\
RUN
apt-get update
\
&&
apt-get
install
-y
g++ rsync apt-utils file patch
\
&&
apt-get
install
-y
g++ rsync
jq
apt-utils file patch
\
&&
apt-get clean
&&
rm
-rf
/var/lib/apt/lists/
*
&&
apt-get clean
&&
rm
-rf
/var/lib/apt/lists/
*
RUN
mkdir
-p
/usr/local/src/protobuf
\
RUN
mkdir
-p
/usr/local/src/protobuf
\
...
@@ -62,14 +62,13 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/
...
@@ -62,14 +62,13 @@ RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe" > /etc/apt/
# work around 64MB tmpfs size in Docker 1.6
# work around 64MB tmpfs size in Docker 1.6
ENV
TMPDIR /tmp.k8s
ENV
TMPDIR /tmp.k8s
# Get the code coverage tool, goimports, and godep
RUN
mkdir
$TMPDIR
\
RUN
mkdir
$TMPDIR
\
&&
chmod
a+rwx
$TMPDIR
\
&&
chmod
a+rwx
$TMPDIR
\
&&
chmod
o+t
$TMPDIR
\
&&
chmod
o+t
$TMPDIR
&&
go get golang.org/x/tools/cmd/cover
\
golang.org/x/tools/cmd/goimports
\
# Get the code coverage tool and goimports
github.com/tools/godep
RUN
go get golang.org/x/tools/cmd/cover
\
golang.org/x/tools/cmd/goimports
# Download and symlink etcd. We need this for our integration tests.
# Download and symlink etcd. We need this for our integration tests.
RUN
export
ETCD_VERSION
=
v3.0.17
;
\
RUN
export
ETCD_VERSION
=
v3.0.17
;
\
...
...
build/build-image/cross/VERSION
View file @
e89ab20c
v1.8.3-
1
v1.8.3-
2
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment