Add missing properties to example compose files (#348888)

c075e721 · Bryant Finney · Achilleas Pipinellis · f8495767 · c075e721
Commit c075e721 authored Dec 20, 2021 by Bryant Finney Committed by Achilleas Pipinellis Dec 20, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 37 additions and 33 deletions

doc/install/docker.md doc/install/docker.md +37 -33

No files found.
--- a/doc/install/docker.md
+++ b/doc/install/docker.md
@@ -141,23 +141,25 @@ install, and upgrade your Docker-based GitLab installation:
 1. Create a `docker-compose.yml` file (or [download an example](https://gitlab.com/gitlab-org/omnibus-gitlab/raw/master/docker/docker-compose.yml)):
   ```yaml
-   web:
+   version: '3.6'
-     image: 'gitlab/gitlab-ee:latest'
+   services:
-     restart: always
+     web:
-     hostname: 'gitlab.example.com'
+       image: 'gitlab/gitlab-ee:latest'
-     environment:
+       restart: always
-       GITLAB_OMNIBUS_CONFIG: |
+       hostname: 'gitlab.example.com'
-         external_url 'https://gitlab.example.com'
+       environment:
-         # Add any other gitlab.rb configuration here, each on its own line
+         GITLAB_OMNIBUS_CONFIG: |
-     ports:
+           external_url 'https://gitlab.example.com'
-       - '80:80'
+           # Add any other gitlab.rb configuration here, each on its own line
-       - '443:443'
+       ports:
-       - '22:22'
+         - '80:80'
-     volumes:
+         - '443:443'
-       - '$GITLAB_HOME/config:/etc/gitlab'
+         - '22:22'
-       - '$GITLAB_HOME/logs:/var/log/gitlab'
+       volumes:
-       - '$GITLAB_HOME/data:/var/opt/gitlab'
+         - '$GITLAB_HOME/config:/etc/gitlab'
-     shm_size: '256m'
+         - '$GITLAB_HOME/logs:/var/log/gitlab'
+         - '$GITLAB_HOME/data:/var/opt/gitlab'
+       shm_size: '256m'
   ```
 1. Make sure you are in the same directory as `docker-compose.yml` and start
@@ -176,22 +178,24 @@ HTTP and SSH port. Notice how the `GITLAB_OMNIBUS_CONFIG` variables match the
 `ports` section:
 ```yaml
-web:
+version: '3.6'
-  image: 'gitlab/gitlab-ee:latest'
+services:
-  restart: always
+  web:
-  hostname: 'gitlab.example.com'
+    image: 'gitlab/gitlab-ee:latest'
-  environment:
+    restart: always
-    GITLAB_OMNIBUS_CONFIG: |
+    hostname: 'gitlab.example.com'
-      external_url 'http://gitlab.example.com:8929'
+    environment:
-      gitlab_rails['gitlab_shell_ssh_port'] = 2224
+      GITLAB_OMNIBUS_CONFIG: |
-  ports:
+        external_url 'http://gitlab.example.com:8929'
-    - '8929:8929'
+        gitlab_rails['gitlab_shell_ssh_port'] = 2224
-    - '2224:22'
+    ports:
-  volumes:
+      - '8929:8929'
-    - '$GITLAB_HOME/config:/etc/gitlab'
+      - '2224:22'
-    - '$GITLAB_HOME/logs:/var/log/gitlab'
+    volumes:
-    - '$GITLAB_HOME/data:/var/opt/gitlab'
+      - '$GITLAB_HOME/config:/etc/gitlab'
-  shm_size: '256m'
+      - '$GITLAB_HOME/logs:/var/log/gitlab'
+      - '$GITLAB_HOME/data:/var/opt/gitlab'
+    shm_size: '256m'
 ```
 This is the same as using `--publish 8929:8929 --publish 2224:22`.