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
d3b838b6
Unverified
Commit
d3b838b6
authored
May 23, 2017
by
Christoph Blecker
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rsync git directories into kube-build
parent
e89ab20c
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
Dockerfile
build/build-image/Dockerfile
+7
-0
rsyncd.sh
build/build-image/rsyncd.sh
+1
-1
common.sh
build/common.sh
+2
-5
No files found.
build/build-image/Dockerfile
View file @
d3b838b6
...
...
@@ -36,6 +36,13 @@ ENV KUBE_OUTPUT_SUBPATH _output/dockerized
# Pick up version stuff here as we don't copy our .git over.
ENV
KUBE_GIT_VERSION_FILE ${HOME}/.dockerized-kube-version-defs
# Add system-wide git user information
RUN
git config
--system
user.email
"nobody@k8s.io"
\
&&
git config
--system
user.name
"kube-build-image"
# Fix permissions on gopath
RUN
chmod
-R
a+rwx
$GOPATH
# Make log messages use the right timezone
ADD
localtime /etc/localtime
RUN
chmod
a+r /etc/localtime
...
...
build/build-image/rsyncd.sh
View file @
d3b838b6
...
...
@@ -77,7 +77,7 @@ port = 8730
secrets file =
${
SECRETS
}
read only = false
path =
${
VOLUME
}
filter = - /.make/ - /
.git/ - /
_tmp/
filter = - /.make/ - /_tmp/
EOF
exec
/usr/bin/rsync
--no-detach
--daemon
--config
=
"
${
CONFFILE
}
"
"
$@
"
build/common.sh
View file @
d3b838b6
...
...
@@ -682,14 +682,10 @@ function kube::build::sync_to_container() {
# they will not be re-generated by 'make'.
kube::build::rsync
\
--delete
\
--filter
=
'+ /staging/**'
\
--filter
=
'- /.git/'
\
--filter
=
'- /.make/'
\
--filter
=
'- /_tmp/'
\
--filter
=
'- /_output/'
\
--filter
=
'- /'
\
--filter
=
'- zz_generated.*'
\
--filter
=
'- generated.proto'
\
"
${
KUBE_ROOT
}
/"
"rsync://k8s@
${
KUBE_RSYNC_ADDR
}
/k8s/"
kube::build::stop_rsyncd_container
...
...
@@ -715,8 +711,9 @@ function kube::build::copy_output() {
# We are looking to copy out all of the built binaries along with various
# generated files.
kube::build::rsync
\
--filter
=
'- /vendor/'
\
--filter
=
'- /_temp/'
\
--filter
=
'+ /vendor/'
\
--filter
=
'+ /Godeps/'
\
--filter
=
'+ /_output/dockerized/bin/**'
\
--filter
=
'+ zz_generated.*'
\
--filter
=
'+ generated.proto'
\
...
...
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