Merge pull request #1544 from rnburn/master

Fix `make container` for OSX.
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-10-18 15:25:03 -04:00 committed by GitHub
commit fb79164f00

View file

@ -72,7 +72,7 @@ all-push: $(addprefix sub-push-,$(ALL_ARCH))
container: .container-$(ARCH)
.container-$(ARCH):
cp -r ./* $(TEMP_DIR)
cp -RP ./* $(TEMP_DIR)
$(SED_I) 's|BASEIMAGE|$(BASEIMAGE)|g' $(DOCKERFILE)
$(SED_I) "s|QEMUARCH|$(QEMUARCH)|g" $(DOCKERFILE)
$(SED_I) "s|DUMB_ARCH|$(DUMB_ARCH)|g" $(DOCKERFILE)