Correct Docker organization

2021-05-10 10:01:54 -07:00 · 2021-05-10 10:01:54 -07:00 · 1866c67924
commit 1866c67924
parent c2afc25c78
10 changed files with 28 additions and 30 deletions
--- a/docs/opensearch-dashboards/install/docker.md
+++ b/docs/opensearch-dashboards/install/docker.md
@ -10,7 +10,7 @@ nav_order: 1

 You *can* start OpenSearch Dashboards using `docker run` after [creating a Docker network](https://docs.docker.com/engine/reference/commandline/network_create/) and starting OpenSearch, but the process of connecting OpenSearch Dashboards to OpenSearch is significantly easier with a Docker Compose file.

-1. Run `docker pull opensearch/opensearch-dashboards:{{site.opensearch_version}}`.
+1. Run `docker pull opensearchproject/opensearch-dashboards:{{site.opensearch_version}}`.

 1. Create a [`docker-compose.yml`](https://docs.docker.com/compose/compose-file/) file appropriate for your environment. A sample file that includes OpenSearch Dashboards is available on the OpenSearch [Docker installation page](../opensearch/docker/#sample-docker-compose-file).

--- a/docs/opensearch-dashboards/install/tar.md
+++ b/docs/opensearch-dashboards/install/tar.md
@ -15,10 +15,9 @@ nav_order: 30
   ```bash
   # x64
   tar -zxf opensearch-dashboards-{{site.opensearch_version}}-linux-x64.tar.gz
-   cd opensearch-dashboards
-   # ARM64
+   cd opensearch-dashboards{% comment %}# ARM64
   tar -zxf opensearch-dashboards-{{site.opensearch_version}}-linux-arm64.tar.gz
-   cd opensearch-dashboards
+   cd opensearch-dashboards{% endcomment %}
   ```

 1. If desired, modify `config/opensearch_dashboards.yml`.
--- a/docs/opensearch/install/docker-security.md
+++ b/docs/opensearch/install/docker-security.md
@ -18,7 +18,7 @@ Additionally, you can set the Docker environment variable `DISABLE_INSTALL_DEMO_
 version: '3'
 services:
  opensearch-node1:
-    image: opensearch/opensearch:{{site.opensearch_version}}
+    image: opensearchproject/opensearch:{{site.opensearch_version}}
    container_name: opensearch-node1
    environment:
      - cluster.name=opensearch-cluster
@ -54,7 +54,7 @@ services:
    networks:
      - opensearch-net
  opensearch-node2:
-    image: opensearch/opensearch:{{site.opensearch_version}}
+    image: opensearchproject/opensearch:{{site.opensearch_version}}
    container_name: opensearch-node2
    environment:
      - cluster.name=opensearch-cluster
@ -87,7 +87,7 @@ services:
    networks:
      - opensearch-net
  opensearch-dashboards
-    image: opensearch/opensearch-dashboards{{site.opensearch_version}}
+    image: opensearchproject/opensearch-dashboards:{{site.opensearch_version}}
    container_name: opensearch-dashboards
    ports:
      - 5601:5601
--- a/docs/opensearch/install/docker.md
+++ b/docs/opensearch/install/docker.md
@ -11,8 +11,8 @@ nav_order: 1
 You can pull the OpenSearch Docker image just like any other image:

 ```bash
-docker pull opensearch/opensearch:{{site.opensearch_version}}
-docker pull opensearch/opensearch-dashboards{{site.opensearch_version}}
+docker pull opensearchproject/opensearch:{{site.opensearch_version}}
+docker pull opensearchproject/opensearch-dashboards:{{site.opensearch_version}}
 ```

 To check available versions, see [Docker Hub](https://hub.docker.com/u/opensearch).
@ -34,7 +34,7 @@ OpenSearch images use `centos:7` as the base image. If you run Docker locally, w
 To run the image for local development:

 ```bash
-docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" opensearch/opensearch:{{site.opensearch_version}}
+docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" opensearchproject/opensearch:{{site.opensearch_version}}
 ```

 Then send requests to the server to verify that OpenSearch is up and running:
@ -87,7 +87,7 @@ This sample file starts two data nodes and a container for OpenSearch Dashboards
 version: '3'
 services:
  opensearch-node1:
-    image: opensearch/opensearch:latest
+    image: opensearchproject/opensearch:{{site.opensearch_version}}
    container_name: opensearch-node1
    environment:
      - cluster.name=opensearch-cluster
@ -111,7 +111,7 @@ services:
    networks:
      - opensearch-net
  opensearch-node2:
-    image: opensearch/opensearch:latest
+    image: opensearchproject/opensearch:{{site.opensearch_version}}
    container_name: opensearch-node2
    environment:
      - cluster.name=opensearch-cluster
@ -132,7 +132,7 @@ services:
    networks:
      - opensearch-net
  opensearch-dashboards:
-    image: opensearch/opensearch-dashboards:latest
+    image: opensearchproject/opensearch-dashboards:{{site.opensearch_version}}
    container_name: opensearch-dashboards
    ports:
      - 5601:5601
@ -165,7 +165,7 @@ docker run \
 -p 9200:9200 -p 9600:9600 \
 -e "discovery.type=single-node" \
 -v /<full-path-to>/custom-opensearch.yml:/usr/share/opensearch/config/opensearch.yml \
-opensearch/opensearch:{{site.opensearch_version}}
+opensearchproject/opensearch:{{site.opensearch_version}}
 ```

 You can perform the same operation in `docker-compose.yml` using a relative path:
@ -289,7 +289,7 @@ docker exec -it <container-id> /bin/bash
 To run the image with a custom plugin, first create a [`Dockerfile`](https://docs.docker.com/engine/reference/builder/):

 ```
-FROM opensearch/opensearch:{{site.opensearch_version}}
+FROM opensearchproject/opensearch:{{site.opensearch_version}}
 RUN /usr/share/opensearch/bin/opensearch-plugin install --batch <plugin-name-or-url>
 ```

@ -303,7 +303,7 @@ docker run -p 9200:9200 -p 9600:9600 -v /usr/share/opensearch/data opensearch-cu
 You can also use a `Dockerfile` to pass your own certificates for use with the [Security](../../../security/) plugin, similar to the `-v` argument in [Configure OpenSearch](#configure-opensearch):

 ```
-FROM opensearch/opensearch:{{site.opensearch_version}}
+FROM opensearchproject/opensearch:{{site.opensearch_version}}
 COPY --chown=opensearch:opensearch opensearch.yml /usr/share/opensearch/config/
 COPY --chown=opensearch:opensearch my-key-file.pem /usr/share/opensearch/config/
 COPY --chown=opensearch:opensearch my-certificate-chain.pem /usr/share/opensearch/config/
@ -313,7 +313,7 @@ COPY --chown=opensearch:opensearch my-root-cas.pem /usr/share/opensearch/config/
 Alternately, you might want to remove a plugin. This `Dockerfile` removes the security plugin:

 ```
-FROM opensearch/opensearch:{{site.opensearch_version}}
+FROM opensearchproject/opensearch:{{site.opensearch_version}}
 RUN /usr/share/opensearch/bin/opensearch-plugin remove opensearch_security
 COPY --chown=opensearch:opensearch opensearch.yml /usr/share/opensearch/config/
 ```
--- a/docs/opensearch/install/tar.md
+++ b/docs/opensearch/install/tar.md
@ -19,10 +19,9 @@ The tarball supports most Linux distributions, including CentOS 7, Amazon Linux
   ```bash
   # x64
   tar -zxf opensearch-{{site.opensearch_version}}-linux-x64.tar.gz
-   cd opensearch-{{site.opensearch_version}}
-   # ARM64
+   cd opensearch-{{site.opensearch_version}}{% comment %}# ARM64
   tar -zxf opensearch-{{site.opensearch_version}}-linux-arm64.tar.gz
-   cd opensearch-{{site.opensearch_version}}
+   cd opensearch-{{site.opensearch_version}}{% endcomment %}
   ```

 1. Run OpenSearch:
--- a/docs/opensearch/snapshot-restore.md
+++ b/docs/opensearch/snapshot-restore.md
@ -104,7 +104,7 @@ Setting | Description
   If you're using the Docker installation, see [Customize the Docker image](../../install/docker/#customize-the-docker-image). Your `Dockerfile` should look something like this:

   ```
-   FROM opensearch/opensearch:{{site.opensearch_version}}
+   FROM opensearchproject/opensearch:{{site.opensearch_version}}

   ENV AWS_ACCESS_KEY_ID <access-key>
   ENV AWS_SECRET_ACCESS_KEY <secret-key>
--- a/docs/security/access-control/cross-cluster-search.md
+++ b/docs/security/access-control/cross-cluster-search.md
@ -67,7 +67,7 @@ Save this file as `docker-compose.yml` and run `docker-compose up` to start two
 version: '3'
 services:
  opensearch-node1:
-    image: opensearch/opensearch:{{site.opensearch_version}}
+    image: opensearchproject/opensearch:{{site.opensearch_version}}
    container_name: opensearch-node1
    environment:
      - cluster.name=opensearch-cluster1
@ -87,7 +87,7 @@ services:
      - opensearch-net

  opensearch-node2:
-    image: opensearch/opensearch:{{site.opensearch_version}}
+    image: opensearchproject/opensearch:{{site.opensearch_version}}
    container_name: opensearch-node2
    environment:
      - cluster.name=opensearch-cluster2
@ -137,8 +137,8 @@ To get the IP address for the remote cluster, first identify its container ID:
 ```bash
 docker ps
 CONTAINER ID    IMAGE                                       PORTS                                                      NAMES
-6fe89ebc5a8e    opensearch/opensearch:{{site.opensearch_version}}   0.0.0.0:9200->9200/tcp, 0.0.0.0:9600->9600/tcp, 9300/tcp   opensearch-node1
-2da08b6c54d8    opensearch/opensearch:{{site.opensearch_version}}   9300/tcp, 0.0.0.0:9250->9200/tcp, 0.0.0.0:9700->9600/tcp   opensearch-node2
+6fe89ebc5a8e    opensearchproject/opensearch:{{site.opensearch_version}}   0.0.0.0:9200->9200/tcp, 0.0.0.0:9600->9600/tcp, 9300/tcp   opensearch-node1
+2da08b6c54d8    opensearchproject/opensearch:{{site.opensearch_version}}   9300/tcp, 0.0.0.0:9250->9200/tcp, 0.0.0.0:9700->9600/tcp   opensearch-node2
 ```

 Then get that container's IP address:
--- a/docs/security/configuration/disable.md
+++ b/docs/security/configuration/disable.md
@ -34,7 +34,7 @@ If you disable the security plugin in `opensearch.yml` (or delete the plugin ent
 1. Create a new `Dockerfile`:

   ```
-   FROM opensearch/opensearch-dashboards:{{site.opensearch_version}}
+   FROM opensearchproject/opensearch-dashboards:{{site.opensearch_version}}
   RUN /usr/share/opensearch-dashboards/bin/opensearch-dashboards-plugin remove opensearchSecurityOpenSearch Dashboards
   COPY --chown=opensearch-dashboards:opensearch-dashboards opensearch_dashboards.yml /usr/share/opensearch-dashboards/config/
   ```
@ -55,6 +55,6 @@ If you disable the security plugin in `opensearch.yml` (or delete the plugin ent
   docker build --tag=opensearch-dashboards-no-security .
   ```

-1. In `docker-compose.yml`, change `opensearch/opensearch-dashboards:{{site.opensearch_version}}` to `opensearch-dashboards-no-security`.
+1. In `docker-compose.yml`, change `opensearchproject/opensearch-dashboards:{{site.opensearch_version}}` to `opensearch-dashboards-no-security`.
 1. Change `OPENSEARCH_HOSTS` or `opensearch.hosts` to `http://` rather than `https://`.
 1. Enter `docker-compose up`.
--- a/docs/trace/data-prepper.md
+++ b/docs/trace/data-prepper.md
@ -123,7 +123,7 @@ serverPort: 1234
 **Docker**

 ```bash
-docker run --name data-prepper --expose 21890 -v /full/path/to/pipelines.yaml:/usr/share/data-prepper/pipelines.yaml -v /full/path/to/data-prepper-config.yaml:/usr/share/data-prepper/data-prepper-config.yaml opensearch/opensearch-data-prepper:latest
+docker run --name data-prepper --expose 21890 -v /full/path/to/pipelines.yaml:/usr/share/data-prepper/pipelines.yaml -v /full/path/to/data-prepper-config.yaml:/usr/share/data-prepper/data-prepper-config.yaml opensearchproject/opensearch-data-prepper:latest
 ```

 **macOS and Linux**
--- a/index.md
+++ b/index.md
@ -52,8 +52,8 @@ Docker
 1. Run the following commands:

   ```bash
-   docker pull opensearch/opensearch:{{site.opensearch_version}}
-   docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" opensearch/opensearch:{{site.opensearch_version}}
+   docker pull opensearchproject/opensearch:{{site.opensearch_version}}
+   docker run -p 9200:9200 -p 9600:9600 -e "discovery.type=single-node" opensearchproject/opensearch:{{site.opensearch_version}}
   ```

 1. In a new terminal session, run: