summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Hennion <nicolas@nicolargo.com>2020-12-05 09:24:19 +0100
committerGitHub <noreply@github.com>2020-12-05 09:24:19 +0100
commit903fa844f46fe6fcb3572f6e643ef42abbe57091 (patch)
treea117a4703ea4703ac1e4111c0d3df7c79b202630
parent5d75484ba70b0bc67dc84ade5bbeb76328fd6054 (diff)
parent7f97e23a59876606bc7e7c6569361102b502418c (diff)
Merge pull request #1762 from eifinger/develop
(ci): Add linux/arm/v6 docker platform
-rw-r--r--.github/workflows/main.yml2
-rw-r--r--README.rst6
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95ee7fb1..4fcd2f10 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -19,7 +19,7 @@ jobs:
id: prepare
env:
DOCKER_IMAGE: ${{ secrets.DOCKER_IMAGE }}
- DOCKER_PLATFORMS: linux/amd64,linux/arm/v7,linux/arm64,linux/386
+ DOCKER_PLATFORMS: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386
run: |
VERSION=latest
diff --git a/README.rst b/README.rst
index 725d7d39..a319741a 100644
--- a/README.rst
+++ b/README.rst
@@ -187,9 +187,9 @@ Get the Glances container (latest develop branch):
Note, you can choose another branch with :
-- nicolargo/glances:latest for the last master branch (included multiple architectures 386, amd64, arm/v7 and arm64)
-- nicolargo/glances:dev for the last develop branch (included multiple architectures 386, amd64, arm/v7 and arm64)
-- nicolargo/glances:<version> for the specific <version> (included multiple architectures 386, amd64, arm/v7 and arm64)
+- nicolargo/glances:latest for the last master branch (included multiple architectures 386, amd64, arm/v6, arm/v7 and arm64)
+- nicolargo/glances:dev for the last develop branch (included multiple architectures 386, amd64, arm/v6, arm/v7 and arm64)
+- nicolargo/glances:<version> for the specific <version> (included multiple architectures 386, amd64, arm/v6, arm/v7 and arm64)
Run the container in *console mode*: