From c7b5bf1554de0cd500945e464870882849c34c21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chrz=C4=85szcz?= Date: Fri, 6 Sep 2024 16:10:17 +0200 Subject: [PATCH 1/2] Make the dockerhub organization configurable Also: use 'REPO' to name the repo, not the organization. --- tools/circleci-prepare-mongooseim-docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/circleci-prepare-mongooseim-docker.sh b/tools/circleci-prepare-mongooseim-docker.sh index 06341b54b7..cfc0a16914 100755 --- a/tools/circleci-prepare-mongooseim-docker.sh +++ b/tools/circleci-prepare-mongooseim-docker.sh @@ -23,7 +23,7 @@ fi echo "Tag: ${DOCKERHUB_TAG}" -export IMAGE_TAG=${DOCKERHUB_REPO}/mongooseim:${DOCKERHUB_TAG} +export IMAGE_TAG=${DOCKERHUB_ORG}/${DOCKERHUB_REPO}:${DOCKERHUB_TAG} git clone https://github.com/esl/mongooseim-docker.git cd mongooseim-docker From 168e2f2c3eeee4b3391be13ea6c21080212a810f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chrz=C4=85szcz?= Date: Wed, 18 Sep 2024 14:28:00 +0200 Subject: [PATCH 2/2] Point dockerhub links to the new repo Also: - Simplify links in README.md - Mention Docker before packages, because Docker images are the recommended way to install MongooseIM --- README.md | 4 ++-- doc/getting-started/Installation.md | 4 ++-- doc/index.md | 2 +- doc/operation-and-maintenance/Logging.md | 2 +- mkdocs.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index ccc9f7b1ba..e004b061c7 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ It is brought to you by [Erlang Solutions](https://www.erlang-solutions.com/). For a quick start just download: -* The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS compatible: AlmaLinux and Rocky Linux) -* The [Docker image](https://hub.docker.com/r/mongooseim/mongooseim/): [https://hub.docker.com/r/mongooseim/mongooseim/](https://hub.docker.com/r/mongooseim/mongooseim/) (source code repository: [https://github.com/esl/mongooseim-docker](https://github.com/esl/mongooseim-docker)) +* The [Docker image](https://hub.docker.com/r/erlangsolutions/mongooseim/) ([source code repository](https://github.com/esl/mongooseim-docker)) * The [Helm chart](https://artifacthub.io/packages/helm/mongoose/mongooseim) ([source code repository](https://github.com/esl/MongooseHelm)) +* The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS compatible: AlmaLinux and Rocky Linux) ## Public testing diff --git a/doc/getting-started/Installation.md b/doc/getting-started/Installation.md index f2382b8820..14dafe5c30 100644 --- a/doc/getting-started/Installation.md +++ b/doc/getting-started/Installation.md @@ -41,14 +41,14 @@ The following sections describe the installation process for different operating In order to install MongooseIM using Docker, simply run the following command: ```bash -docker pull mongooseim/mongooseim +docker pull erlangsolutions/mongooseim ``` This will download the latest release. You can use tags to download an exact version. We build Docker images for every release marked with a git tag, as well as for every Pull Request. -You can see all of them on [DockerHub](https://hub.docker.com/r/mongooseim/mongooseim). +You can see all of them on [DockerHub](https://hub.docker.com/r/erlangsolutions/mongooseim). In order to learn more about how the images are built, please visit the [source code repository](https://github.com/esl/mongooseim-docker). The `mongooseimctl` command is available in `/usr/lib/mongooseim/bin/mongooseimctl` in the container. diff --git a/doc/index.md b/doc/index.md index 15254e5716..0aca0ca2cc 100644 --- a/doc/index.md +++ b/doc/index.md @@ -59,7 +59,7 @@ We offer a set of additional server-side components: For a quick start just download: * The [pre-built packages](https://www.erlang-solutions.com/resources/download.html) that suit your platform (Ubuntu, Debian, CentOS compatible: AlmaLinux and Rocky Linux) -* The [Docker image](https://hub.docker.com/r/mongooseim/mongooseim/) ([source code repository](https://github.com/esl/mongooseim-docker)) +* The [Docker image](https://hub.docker.com/r/erlangsolutions/mongooseim/) ([source code repository](https://github.com/esl/mongooseim-docker)) * The [Helm chart](https://artifacthub.io/packages/helm/mongoose/mongooseim) ([source code repository](https://github.com/esl/MongooseHelm)) See the [installation guide](getting-started/Installation.md) for more details. diff --git a/doc/operation-and-maintenance/Logging.md b/doc/operation-and-maintenance/Logging.md index 18e20bc0b1..3d6b0487ec 100644 --- a/doc/operation-and-maintenance/Logging.md +++ b/doc/operation-and-maintenance/Logging.md @@ -260,7 +260,7 @@ Run MongooseIM daemon: ```bash docker run -d -t -h mongooseim -v mongooseim-logs:/usr/lib/mongooseim/log \ - --network logging --name mongooseim -p 5222:5222 mongooseim/mongooseim:latest + --network logging --name mongooseim -p 5222:5222 erlangsolutions/mongooseim:latest ``` The next part is based on [Filebeat's docs](https://www.elastic.co/guide/en/beats/filebeat/current/running-on-docker.html). diff --git a/mkdocs.yml b/mkdocs.yml index b53884e17c..2e7351b30c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -32,7 +32,7 @@ extra: provider: mike social: - icon: fontawesome/brands/docker - link: https://hub.docker.com/r/mongooseim/mongooseim/ + link: https://hub.docker.com/r/erlangsolutions/mongooseim/ - icon: fontawesome/brands/github link: https://github.com/esl/MongooseIM plugins: