[allura] branch master updated: [#8488] applied patch and updated docs

[gc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/master by this push:
     new c690b1f6c [#8488] applied patch and updated docs
c690b1f6c is described below

commit c690b1f6c66c6361cabbb17cc8a902ee2faf12f9
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Fri Jan 6 11:14:37 2023 -0600

    [#8488] applied patch and updated docs
---
 Allura/docs/getting_started/installation.rst | 8 +++++++-
 docker-compose-prod.yml                      | 8 ++++----
 docker-compose.yml                           | 6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index c519c42cb..8baea1555 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -34,7 +34,7 @@ First run
 
 `Download the latest release <http://www.apache.org/dyn/closer.cgi/allura/>`_ of Allura, or `clone from git <https://forge-allura.apache.org/p/allura/git/ci/master/tree/>`_ for the bleeding edge.
 
-Install `Docker <http://docs.docker.com/installation/>`_ and `Docker Compose <https://docs.docker.com/compose/install/>`_.
+Install `Docker <http://docs.docker.com/installation/>`_ and the latest version of `Docker Compose <https://docs.docker.com/compose/install/>`_.
 On Linux, you may need to `create a docker group <https://docs.docker.com/engine/install/linux-postinstall/>`_.
 
 .. note::
@@ -96,6 +96,12 @@ Start containers in the background:
 You're up and running!  Visit localhost:8080 (or whatever IP address you're running Docker on).  Then
 see our :ref:`post-setup-instructions` and read more below about the Docker environment for Allura.
 
+.. note::
+   
+   Older versions of Docker compose might not recognize image names that contain hyphens throwing the following error :code:`Error response from daemon: pull access denied for allura-web, repository does not exist or may require 'docker login': denied: requested access to the resource is denied`
+
+   You will need to either upgrade to the lastest version of Docker compose or edit and replace the images names hyphens with underscores in `docker-compose.yml` and `docker-compose-prod.yml`.
+
 
 Containers
 ^^^^^^^^^^
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index b20f7810e..9fd59fc60 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -55,7 +55,7 @@ services:
     restart: always
 
   taskd:
-    image: allura_web
+    image: allura-web
     working_dir: /allura/Allura
     environment: *env
     command: paster taskd /allura-data/production.ini
@@ -68,7 +68,7 @@ services:
   # This is a single-purpose container that does not auto-restart, good for running commands like:
   # docker-compose run --rm oneoff paster ensure_index /allura-data/production.ini
   oneoff:
-    image: allura_web
+    image: allura-web
     working_dir: /allura/Allura
     environment: *env
     volumes: *volumes
@@ -95,7 +95,7 @@ services:
     restart: always
 
   inmail:
-    image: allura_web
+    image: allura-web
     working_dir: /allura/Allura
     environment: *env
     volumes: *volumes
@@ -142,4 +142,4 @@ services:
       - "/var/run/docker.sock:/var/run/docker.sock:ro"
     volumes_from:
       - "nginx-proxy"
-    restart: always
\ No newline at end of file
+    restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index 6a1da1545..ea91932ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       - solr
 
   taskd:
-    image: allura_web
+    image: allura-web
     working_dir: /allura/Allura
     environment: *env
     command: paster taskd docker-dev.ini
@@ -60,7 +60,7 @@ services:
     command: mongod --storageEngine wiredTiger
 
   outmail:
-    image: allura_web
+    image: allura-web
     environment: *env
     volumes_from:
       - web
@@ -69,7 +69,7 @@ services:
       - "8826"
 
   inmail:
-    image: allura_web
+    image: allura-web
     working_dir: /allura/Allura
     environment: *env
     volumes: *volumes