Merge pull request #12539 from cameronbrunner/issue-11902-mac-iso-build
Update MacOS ISO build stepspull/12554/head
commit
c409732d49
2
Makefile
2
Makefile
|
@ -312,7 +312,7 @@ ifeq ($(IN_DOCKER),1)
|
|||
else
|
||||
docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \
|
||||
--user $(shell id -u):$(shell id -g) --env HOME=/tmp --env IN_DOCKER=1 \
|
||||
$(ISO_BUILD_IMAGE) /usr/bin/make out/minikube.iso
|
||||
$(ISO_BUILD_IMAGE) /bin/bash -lc '/usr/bin/make out/minikube.iso'
|
||||
endif
|
||||
|
||||
iso_in_docker:
|
||||
|
|
|
@ -15,7 +15,8 @@
|
|||
FROM ubuntu:18.04
|
||||
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y apt dpkg apt-utils ca-certificates \
|
||||
&& apt-get install -y apt dpkg apt-utils ca-certificates software-properties-common \
|
||||
&& add-apt-repository -y ppa:longsleep/golang-backports \
|
||||
&& apt-get upgrade -y \
|
||||
&& apt-get install -y \
|
||||
build-essential \
|
||||
|
|
Loading…
Reference in New Issue