git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd1d04e
)
bootstrap/config.py: rm ENV for ccache since we didn't use it any more
author
Joe Guo
<joeg@catalyst.net.nz>
Tue, 12 Mar 2019 06:06:03 +0000
(19:06 +1300)
committer
Stefan Metzmacher
<metze@samba.org>
Thu, 18 Apr 2019 12:09:32 +0000
(12:09 +0000)
When ccache is not installed, this will cause failure.
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
bootstrap/config.py
patch
|
blob
|
history
diff --git
a/bootstrap/config.py
b/bootstrap/config.py
index 79e23b2c34b9f3dffe96e5231ebd49c73c80f02c..a658fdda2238f64b54bb2dbfdf670a55333a2168 100644
(file)
--- a/
bootstrap/config.py
+++ b/
bootstrap/config.py
@@
-267,9
+267,6
@@
fi
DOCKERFILE = r"""
FROM {docker_image}
-# we will use this image to run ci, these ENV vars are important
-ENV CC="ccache gcc"
-
ADD *.sh /tmp/
# need root permission, do it before USER samba
RUN /tmp/bootstrap.sh && /tmp/locale.sh