Skip to content

Commit 12122f7

Browse files
authoredMay 11, 2020
Merge pull request #8053 from medyagh/arm64_docker_solution
docker/podman solution message for non-amd64 archs
2 parents d2ae2b3 + 7c91271 commit 12122f7

File tree

5 files changed

+24
-3
lines changed

5 files changed

+24
-3
lines changed
 

‎pkg/minikube/registry/drvs/docker/docker.go

+4
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
7171

7272
func status() registry.State {
7373
docURL := "https://minikube.sigs.k8s.io/docs/drivers/docker/"
74+
if runtime.GOARCH != "amd64" {
75+
return registry.State{Error: fmt.Errorf("docker driver is not supported on %q systems yet", runtime.GOARCH), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL}
76+
}
77+
7478
_, err := exec.LookPath(oci.Docker)
7579
if err != nil {
7680
return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Docker", Doc: docURL}

‎pkg/minikube/registry/drvs/podman/podman.go

+4
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ func configure(cc config.ClusterConfig, n config.Node) (interface{}, error) {
7474

7575
func status() registry.State {
7676
docURL := "https://minikube.sigs.k8s.io/docs/drivers/podman/"
77+
if runtime.GOARCH != "amd64" {
78+
return registry.State{Error: fmt.Errorf("podman driver is not supported on %q systems yet", runtime.GOARCH), Installed: false, Healthy: false, Fix: "Try other drivers", Doc: docURL}
79+
}
80+
7781
podman, err := exec.LookPath(oci.Podman)
7882
if err != nil {
7983
return registry.State{Error: err, Installed: false, Healthy: false, Fix: "Install Podman", Doc: docURL}

‎site/content/en/docs/drivers/docker.md

+3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ The Docker driver allows you to install Kubernetes into an existing Docker insta
1919

2020
## Known Issues
2121

22+
- Docker driver is not supported on non-amd64 architectures such as arm yet. For non-amd64 archs please use [other drivers]({{< ref "/docs/drivers/" >}}
23+
2224
- On macOS, containers might get hung and require a restart of Docker for Desktop. See [docker/for-mac#1835](https://github.com/docker/for-mac/issues/1835)
2325

2426
- The `ingress`, `ingress-dns` and `registry` addons are currently only supported on Linux. See [#7332](https://github.com/kubernetes/minikube/issues/7332) and [#7535](https://github.com/kubernetes/minikube/issues/7535)
@@ -28,6 +30,7 @@ The Docker driver allows you to install Kubernetes into an existing Docker insta
2830
`sudo mkdir /sys/fs/cgroup/systemd && sudo mount -t cgroup -o none,name=systemd cgroup /sys/fs/cgroup/systemd`.
2931

3032

33+
3134
## Troubleshooting
3235

3336
[comment]: <> (this title is used in the docs links, don't change)

‎site/content/en/docs/drivers/includes/docker_usage.inc

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
## Install Docker
1+
## Requirements
22

3-
- [Docker](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc)
3+
- [Install Docker](https://hub.docker.com/search?q=&type=edition&offering=community&sort=updated_at&order=desc)
4+
- amd64 system.
45

56
## Usage
67

@@ -14,3 +15,4 @@ To make docker the default driver:
1415
```shell
1516
minikube config set driver docker
1617
```
18+

‎site/content/en/docs/drivers/podman.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ aliases:
1111
This driver is experimental and in active development. Help wanted!
1212
{{% /pageinfo %}}
1313

14-
The podman driver is another kubernetes in container driver for minikube. similar to [docker](https://minikube.sigs.k8s.io/Drivers/docker/) driver. The podman driver is experimental, and only supported on Linux and macOS (with a remote podman server)
14+
The podman driver is another kubernetes in container driver for minikube. similar to [docker](https://minikube.sigs.k8s.io/Drivers/docker/) driver. The podman driver is experimental, and only supported on Linux and macOS (with a remote podman server).
15+
16+
## Requirements
17+
18+
- Install [Podman](https://podman.io/getting-started/installation)
19+
- amd64 system
1520

1621
## Try it with CRI-O container runtime.
1722

@@ -20,3 +25,6 @@ minikube start --driver=podman --container-runtime=cri-o
2025
```
2126

2227
{{% readfile file="/docs/drivers/includes/podman_usage.inc" %}}
28+
29+
## Known Issues
30+
- Podman driver is not supported on non-amd64 architectures such as arm yet. For non-amd64 archs please use [other drivers]({{< ref "/docs/drivers/" >}}

0 commit comments

Comments
 (0)