You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2019/03/20 15:32:10 UTC
[allura] branch master updated: [#8259] Update Ubuntu 16.04 to
18.04 and Cryptography python package from 1.4 to 2.6.1,
since Cryptography 1.4 does not work with the new version of libssl-dev in
Ubuntu 18.04. Current version of Solr does not work with
default-jre-headless (Java runtime 1.10) in Ubuntu 18.04,
for that reason openjdk-8-jre-headless (default-jre-headless in Ubuntu
16.04) need to be installed instead.
This is an automated email from the ASF dual-hosted git repository.
brondsem 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 36d3536 [#8259] Update Ubuntu 16.04 to 18.04 and Cryptography python package from 1.4 to 2.6.1, since Cryptography 1.4 does not work with the new version of libssl-dev in Ubuntu 18.04. Current version of Solr does not work with default-jre-headless (Java runtime 1.10) in Ubuntu 18.04, for that reason openjdk-8-jre-headless (default-jre-headless in Ubuntu 16.04) need to be installed instead.
36d3536 is described below
commit 36d3536a1e42cf3cf36bfc05eb19da042a038a8a
Author: Paul Bustios <pb...@gmail.com>
AuthorDate: Mon Mar 18 15:13:51 2019 -0300
[#8259] Update Ubuntu 16.04 to 18.04 and Cryptography python package from 1.4 to 2.6.1, since Cryptography 1.4 does not work with the new version of libssl-dev in Ubuntu 18.04. Current version of Solr does not work with default-jre-headless (Java runtime 1.10) in Ubuntu 18.04, for that reason openjdk-8-jre-headless (default-jre-headless in Ubuntu 16.04) need to be installed instead.
---
Allura/docs/getting_started/install_each_step.rst | 8 ++++----
Dockerfile | 2 +-
requirements.txt | 11 +++++------
scm_config/git-http/Dockerfile | 2 +-
4 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Allura/docs/getting_started/install_each_step.rst b/Allura/docs/getting_started/install_each_step.rst
index 399d510..c003222 100644
--- a/Allura/docs/getting_started/install_each_step.rst
+++ b/Allura/docs/getting_started/install_each_step.rst
@@ -29,11 +29,11 @@ Step-by-Step Installation
For a simpler setup using Docker images, see :ref:`docker-install` instead.
-In these instructions, we'll use `VirtualBox <http://www.virtualbox.org>`__ and `Ubuntu 16.04 <http://ubuntu.com>`_ (15.04 works too) to create a disposable sandbox for Allura development/testing. Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
+In these instructions, we'll use `VirtualBox <http://www.virtualbox.org>`__ and `Ubuntu 18.04 <http://ubuntu.com>`_ to create a disposable sandbox for Allura development/testing. Allura should work on other Linux systems (including OSX), but setting up all the dependencies will be different.
* Download and install `VirtualBox <http://www.virtualbox.org/wiki/Downloads>`__ for your platform.
-* Download a minimal `Ubuntu 16.04 64-bit ISO <https://help.ubuntu.com/community/Installation/MinimalCD>`_.
+* Download a minimal `Ubuntu 18.04 64-bit ISO <https://help.ubuntu.com/community/Installation/MinimalCD>`_.
* Create a new virtual machine in Virtual Box, selecting Ubuntu (64 bit) as the OS type. The rest of the wizards' defaults are fine.
@@ -152,8 +152,8 @@ We have a custom config ready for use.
.. code-block:: bash
- (env-allura)~$ cd tmp
- (env-allura)/tmp$ sudo apt-get install default-jre-headless unzip
+ (env-allura)~$ cd /tmp
+ (env-allura)/tmp$ sudo apt-get install openjdk-8-jre-headless unzip
(env-allura)/tmp$ wget -nv http://archive.apache.org/dist/lucene/solr/5.3.1/solr-5.3.1.tgz
(env-allura)/tmp$ tar xvf solr-5.3.1.tgz solr-5.3.1/bin/install_solr_service.sh --strip-components=2
(env-allura)/tmp$ sudo ./install_solr_service.sh solr-5.3.1.tgz
diff --git a/Dockerfile b/Dockerfile
index a3cecc5..2a5eb55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM ubuntu:16.04
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y \
git-core \
diff --git a/requirements.txt b/requirements.txt
index dc1c07c..7189d95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -55,15 +55,14 @@ webencodings==0.5.1
WebOb==1.0.8
# dependencies for cryptography
-cryptography==1.4
+cryptography==2.6.1
# loose spec for setuptools since it is a very base package; but cryptography needs it past a certain version
setuptools>=11.3
-cffi==1.7.0
-pycparser==2.14
+cffi==1.12.2
+pycparser==2.19
enum34==1.1.6
-ipaddress==1.0.16
-idna==2.1
-pyasn1==0.1.9
+ipaddress==1.0.22
+asn1crypto==0.24.0
# tg2 deps (not used directly)
Babel==1.3
diff --git a/scm_config/git-http/Dockerfile b/scm_config/git-http/Dockerfile
index 36111b1..1bca3a1 100644
--- a/scm_config/git-http/Dockerfile
+++ b/scm_config/git-http/Dockerfile
@@ -20,7 +20,7 @@
# not inspired by https://hub.docker.com/_/httpd/ which does a custom source-based install of httpd
# match main allura Dockerfile, for shared base
-FROM ubuntu:16.04
+FROM ubuntu:18.04
RUN apt-get update && apt-get install -y \
apache2 \