github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #40613 from lucab/to-k8s/test-images-chmod-x 

Automatic merge from submit-queue

test/images/mount-tester: ensure exec binary is o+rx

The `mount-tester` image is currently used as a base layer for other
test images (like `mounttest-user`) which perform uid/gid changes.
However, the binary built in here just follows local umask, and currently is
```
-rwxr-x--- 1 root root 2052704 May 19  2016 mt
```

This commit adds an explicit chmod on the binary to make sure uid/gid
tests can still run it as "others".
pull/6/head
Kubernetes Submit Queue 2017-01-31 12:54:03 -08:00 committed by GitHub
parent 86d561424d f024329eec
commit f5e9350d21
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/images/mount-tester/Makefile
View File

@ -12,13 +12,14 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = 0.7 TAG = 0.8
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push
mt: mt.go mt: mt.go
CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' ./mt.go && \
chmod a+rx mt
image: mt image: mt
sudo docker build --pull -t $(PREFIX)/mounttest:$(TAG) . sudo docker build --pull -t $(PREFIX)/mounttest:$(TAG) .