Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix vboxsf host mounting. #2986

Merged
merged 2 commits into from
Jul 16, 2018
+102 −6
Merged

Fix vboxsf host mounting. #2986

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4c9f02
Update cri-tools to 1.11.1.
Jul 13, 2018
50e0d26
Fix vboxsf host mounting.
Jul 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update cri-tools to 1.11.1.
dlorenc committed Jul 13, 2018

Unverified

No user is associated with the committer email.
Learn about vigilant mode
commit a4c9f02497e98e8ef3606c52bd12cee6f7a880d9
1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ RUN apt-get update \
rsync \
dumb-init \
golang-go \
libpcre3-dev \
&& rm -rf /var/lib/apt/lists/*

RUN localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
4 changes: 1 addition & 3 deletions deploy/iso/minikube-iso/package/cri-tools/cri-tools.hash
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
sha256 e83b5a8ff6fc2c98c3463600e74a86d7dbbea6330f883cd5663cbd59641a8086 v0.2.tar.gz
sha256 2c8e45414d5804628f557171d622ca3e4a55dfc1f2de0cd33bcba98e863342d1 v1.0.0-alpha.0.tar.gz
sha256 688cd566e11f09247e8135ac1ee65e5afb3ea3303c00569c5e1e265e3b2c68f6 v1.0.0-beta.0.tar.gz
sha256 a357c67c891896032865f7a34f7ec330e5a00fe7f20b6d8be50399b91c99a4ac v1.11.1.tar.gz
3 changes: 2 additions & 1 deletion deploy/iso/minikube-iso/package/cri-tools/cri-tools.mk
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
#
################################################################################

CRI_TOOLS_VERSION = v1.0.0-beta.0
CRI_TOOLS_VERSION = v1.11.1
CRI_TOOLS_SITE = https://github.com/kubernetes-incubator/cri-tools/archive
CRI_TOOLS_SOURCE = $(CRI_TOOLS_VERSION).tar.gz
CRI_TOOLS_LICENSE = Apache-2.0
@@ -14,6 +14,7 @@ CRI_TOOLS_GOPATH = $(@D)/_output
CRI_TOOLS_ENV = \
CGO_ENABLED=1 \
GOPATH="$(CRI_TOOLS_GOPATH)" \
GOBIN="$(CRI_TOOLS_GOPATH)/bin" \
PATH=$(CRI_TOOLS_GOPATH)/bin:$(BR_PATH)


1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ CRIO_BIN_GOPATH = $(@D)/_output
CRIO_BIN_ENV = \
CGO_ENABLED=1 \
GOPATH="$(CRIO_BIN_GOPATH)" \
GOBIN="$(CRIO_BIN_GOPATH)/bin" \
PATH=$(CRIO_BIN_GOPATH)/bin:$(BR_PATH)


1 change: 1 addition & 0 deletions deploy/iso/minikube-iso/package/kpod/kpod.mk
View file
Original file line number Diff line number Diff line change
@@ -10,6 +10,7 @@ KPOD_GOPATH = $(@D)/_output
KPOD_BIN_ENV = \
CGO_ENABLED=1 \
GOPATH="$(KPOD_GOPATH)" \
GOBIN="$(KPOD_GOPATH)/bin" \
PATH=$(KPOD_GOPATH)/bin:$(BR_PATH)