kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #12539 from cameronbrunner/issue-11902-mac-iso-build 

Update MacOS ISO build steps
pull/12554/head
Medya Ghazizadeh 2021-09-22 14:20:12 -07:00 committed by GitHub
parent fb7de65ba5 c4d9647335
commit c409732d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -312,7 +312,7 @@ ifeq ($(IN_DOCKER),1)
else else
docker run --rm --workdir /mnt --volume $(CURDIR):/mnt $(ISO_DOCKER_EXTRA_ARGS) \ 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 \ --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 endif
iso_in_docker: iso_in_docker:

3
deploy/iso/minikube-iso/Dockerfile
View File

@ -15,7 +15,8 @@
FROM ubuntu:18.04 FROM ubuntu:18.04
RUN apt-get update \ 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 upgrade -y \
&& apt-get install -y \ && apt-get install -y \
build-essential \ build-essential \