You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by di...@apache.org on 2021/10/26 15:14:40 UTC
[allura] branch dw/8399 created (now 1aee626)
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a change to branch dw/8399
in repository https://gitbox.apache.org/repos/asf/allura.git.
at 1aee626 [#8399] werkzeug 1.0.1 -> 2.0.2
This branch includes the following new commits:
new 05124a5 [#8399] fix port config for gunicorn==20.x.x
new 2467dee [#8399] move default data location /allura-data -> ./allura-data
new 1aee626 [#8399] werkzeug 1.0.1 -> 2.0.2
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[allura] 03/03: [#8399] werkzeug 1.0.1 -> 2.0.2
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8399
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 1aee626a8a5d011b4e1b2e5664f43221943d26c6
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Tue Oct 26 11:12:34 2021 -0400
[#8399] werkzeug 1.0.1 -> 2.0.2
---
requirements.txt | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/requirements.txt b/requirements.txt
index 3116a27..769f3c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
#
-# This file is autogenerated by pip-compile with python 3.7
+# This file is autogenerated by pip-compile with python 3.6
# To update, run:
#
# pip-compile
@@ -30,6 +30,8 @@ creoleparser==0.7.5
# via pypeline
cryptography==35.0.0
# via -r requirements.in
+dataclasses==0.8
+ # via werkzeug
datadiff==2.0.0
# via -r requirements.in
decorator==5.1.0
@@ -91,7 +93,7 @@ ming==0.11.1
# via -r requirements.in
mock==3.0.5
# via -r requirements.in
-https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d9265133e995fa.zip#egg=oauth2
+oauth2 @ https://github.com/joestump/python-oauth2/archive/b94f69b1ad195513547924e380d9265133e995fa.zip
# via -r requirements.in
oauthlib==3.0.2
# via requests-oauthlib
@@ -212,7 +214,7 @@ webob==1.7.4
# webtest
webtest==3.0.0
# via -r requirements.in
-werkzeug==1.0.1
+werkzeug==2.0.2
# via -r requirements.in
wrapt==1.11.2
# via -r requirements.in
[allura] 01/03: [#8399] fix port config for gunicorn==20.x.x
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8399
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 05124a5816a81eb4520c5fb0582f48c514525739
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Mon Oct 25 17:16:34 2021 -0400
[#8399] fix port config for gunicorn==20.x.x
---
Allura/docker-dev.ini | 5 -----
Allura/production-docker-example.ini | 5 -----
Dockerfile | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/Allura/docker-dev.ini b/Allura/docker-dev.ini
index 7a7faaf..73e4de7 100644
--- a/Allura/docker-dev.ini
+++ b/Allura/docker-dev.ini
@@ -15,11 +15,6 @@
; specific language governing permissions and limitations
; under the License.
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 8088
-
# profile for profiling. use in conjunction with filter-with below.
;[filter:profile]
;use = egg:repoze.profile#profile
diff --git a/Allura/production-docker-example.ini b/Allura/production-docker-example.ini
index 1824aa1..df5dd59 100644
--- a/Allura/production-docker-example.ini
+++ b/Allura/production-docker-example.ini
@@ -30,11 +30,6 @@
; You are free to make additional changes/additions to this file for other settings
-[server:main]
-use = egg:Paste#http
-host = 0.0.0.0
-port = 8080
-
[app:main]
; this is a path within docker, thus it's just /allura
use = config:/allura/Allura/docker-dev.ini#main
diff --git a/Dockerfile b/Dockerfile
index f361e92..382763e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,4 +50,4 @@ ENV USER root
WORKDIR /allura
ENV PYTHONUNBUFFERED 1
-CMD gunicorn --paste Allura/docker-dev.ini --reload
+CMD gunicorn --paste Allura/docker-dev.ini -b :8088 --reload
[allura] 02/03: [#8399] move default data location /allura-data ->
./allura-data
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dill0wn pushed a commit to branch dw/8399
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 2467dee011e575130ee97272b2dd845a5b6b0e3a
Author: Dillon Walls <di...@slashdotmedia.com>
AuthorDate: Mon Oct 25 17:24:02 2021 -0400
[#8399] move default data location /allura-data -> ./allura-data
This may break existing installations, if you run into trouble, you can export LOCAL_SHARED_DATA_ROOT=/allura-data, or modify ./.env to point to that location.
---
.env | 1 +
.gitignore | 1 +
Allura/docs/getting_started/installation.rst | 19 +++++++++++--------
docker-compose-prod.yml | 6 +++---
docker-compose.yml | 8 ++++----
5 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/.env b/.env
index 6c38244..34715bc 100644
--- a/.env
+++ b/.env
@@ -17,3 +17,4 @@
COMPOSE_PROJECT_NAME=allura
+LOCAL_SHARED_DATA_ROOT=./allura-data
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 63e1bde..c620e79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@ report.clonedigger
/Allura/src/
async-disk-cache/
ForgeGit/forgegit/tests/data/testgit.git/FETCH_HEAD
+allura-data/
diff --git a/Allura/docs/getting_started/installation.rst b/Allura/docs/getting_started/installation.rst
index 0c06b18..7ed72e9 100644
--- a/Allura/docs/getting_started/installation.rst
+++ b/Allura/docs/getting_started/installation.rst
@@ -35,8 +35,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/>`_.
-On Linux, you may need to `create a docker group <https://docs.docker.com/engine/installation/linux/ubuntulinux/#create-a-docker-group>`_. On Mac, make sure
-you're in a directory that Virtual Box shares through to the VM (by default, anywhere in your home directory works).
+On Linux, you may need to `create a docker group <https://docs.docker.com/engine/installation/linux/ubuntulinux/#create-a-docker-group>`_.
.. note::
@@ -64,7 +63,6 @@ Build/fetch all required images:
.. code-block:: bash
- export COMPOSE_PROJECT_NAME=allura
docker-compose build
Python and JS package setup (and first containers started):
@@ -122,14 +120,19 @@ changes.
Python environment:
-- :file:`/allura-data/virtualenv/bin/python`
+- :file:`./allura-data/virtualenv/bin/python`
Services data:
-- :file:`/allura-data/mongo` - mongo data
-- :file:`/allura-data/solr` - SOLR index
-- :code:`/allura-data/scm/{git,hg,svn}` - code repositories
-- :file:`/allura-data/scm/snapshots` - generated code snapshots
+- :file:`./allura-data/mongo` - mongo data
+- :file:`./allura-data/solr` - SOLR index
+- :code:`./allura-data/scm/{git,hg,svn}` - code repositories
+- :file:`./allura-data/scm/snapshots` - generated code snapshots
+
+
+.. note::
+
+ The :code:`./allura-data/` path can be overriden by setting the LOCAL_SHARED_DATA_ROOT environment variable
Ports, exposed to host system
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index acb46ba..cee10b0 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -46,7 +46,7 @@ services:
- "8080"
volumes: &volumes
- .:/allura # Allura source code from local host
- - /allura-data:/allura-data # for virtualenv, scm repos, etc
+ - ${LOCAL_SHARED_DATA_ROOT}:/allura-data # for virtualenv, scm repos, etc
links:
- mongo
- solr
@@ -82,7 +82,7 @@ services:
- "8983"
volumes:
- ./solr_config/allura:/opt/solr/server/solr/allura
- - /allura-data/solr:/opt/solr/server/solr/allura/data
+ - ${LOCAL_SHARED_DATA_ROOT}/solr:/opt/solr/server/solr/allura/data
restart: always
mongo:
@@ -90,7 +90,7 @@ services:
ports:
- "127.0.0.1:27017:27017"
volumes:
- - /allura-data/mongo:/data/db
+ - ${LOCAL_SHARED_DATA_ROOT}/mongo:/data/db
command: mongod --storageEngine wiredTiger
restart: always
diff --git a/docker-compose.yml b/docker-compose.yml
index 6fbf5d0..38d76a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -26,8 +26,8 @@ services:
- "8088:8088"
volumes: &volumes
- .:/allura # Allura source code from local host
- - /allura-data:/allura-data # for virtualenv, scm repos, etc
- - /allura-data/root/home:/root # for persistent home dir, mainly for pudb
+ - ${LOCAL_SHARED_DATA_ROOT}:/allura-data # for virtualenv, scm repos, etc
+ - ${LOCAL_SHARED_DATA_ROOT}/root/home:/root # for persistent home dir, mainly for pudb
links:
- mongo
- solr
@@ -49,14 +49,14 @@ services:
- "8983:8983"
volumes:
- ./solr_config/allura:/opt/solr/server/solr/allura
- - /allura-data/solr:/opt/solr/server/solr/allura/data
+ - ${LOCAL_SHARED_DATA_ROOT}/solr:/opt/solr/server/solr/allura/data
mongo:
image: mongo:4.2
ports:
- "27017:27017"
volumes:
- - /allura-data/mongo:/data/db
+ - ${LOCAL_SHARED_DATA_ROOT}/mongo:/data/db
command: mongod --storageEngine wiredTiger
outmail: