Bump Ushahidi to 3.12.3 and use different installation method

This commit is contained in:
Disassembler 2018-08-29 11:04:41 +02:00
parent e2cae77ecd
commit 1b232ef8f3
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
4 changed files with 46 additions and 7 deletions

View File

@ -7,19 +7,20 @@ RUN \
RUN \
# Download Ushahidi
wget https://github.com/ushahidi/platform-release/releases/download/v3.12.1/ushahidi-platform-release-v3.12.1.tar.gz -O /tmp/ushahidi.tgz \
&& tar xzf /tmp/ushahidi.tgz -C /tmp \
&& mv /tmp/ushahidi-platform-release-v3.12.1/html /srv/ushahidi \
wget https://github.com/ushahidi/platform-client/releases/download/v3.12.3/ushahidi-platform-client-bundle-v3.12.3.tar.gz -O /tmp/ushahidi-platform-client-bundle.tar.gz \
&& wget https://github.com/ushahidi/platform/releases/download/v3.12.3/ushahidi-platform-bundle-v3.12.3.tar.gz -O /tmp/ushahidi-platform-bundle.tar.gz \
&& tar xzf /tmp/ushahidi-platform-client-bundle.tar.gz -C /srv \
&& mv /srv/ushahidi-platform-client-bundle-v3.12.3 /srv/ushahidi \
&& tar xzf /tmp/ushahidi-platform-bundle.tar.gz -C /srv/ushahidi \
&& mv /srv/ushahidi/ushahidi-platform-bundle-v3.12.3 /srv/ushahidi/platform \
# Create OS user
&& addgroup -S -g 8014 ushahidi \
&& adduser -S -u 8014 -h /srv/ushahidi -s /bin/false -g ushahidi -G ushahidi ushahidi \
&& chown -R ushahidi:ushahidi /srv/ushahidi/platform/application/logs /srv/ushahidi/platform/application/cache /srv/ushahidi/platform/application/media/uploads \
# Cleanup
&& rm -rf /tmp/ushahidi.tgz /tmp/ushahidi-platform-release-v3.12.1
&& rm -rf /tmp/ushahidi-platform-client-bundle.tar.gz /tmp/ushahidi-platform-bundle.tar.gz
COPY docker/etc/ /etc/
COPY --chown=8014:8014 docker/srv/ushahidi/ /srv/ushahidi/
COPY docker/ /
RUN \
# Patch Previewers

View File

@ -0,0 +1,3 @@
window.ushahidi = {
backendUrl : "/platform"
};

View File

@ -0,0 +1,34 @@
<?php defined('SYSPATH') OR die('No direct access allowed.');
/**
* Kohana Init Config
*
* @author Ushahidi Team <team@ushahidi.com>
* @package Ushahidi\Application\Config
* @copyright 2013 Ushahidi
* @license https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License Version 3 (AGPL3)
*/
/**
* Initialize Kohana, setting the default options.
*
* The following options are available:
*
* - string base_url path, and optionally domain, of your application NULL
* - string index_file name of your index file, usually "index.php" index.php
* - string charset internal character set used for input and output utf-8
* - string cache_dir set the internal cache directory APPPATH/cache
* - integer cache_life lifetime, in seconds, of items cached 60
* - boolean errors enable or disable error handling TRUE
* - boolean profile enable or disable internal profiling TRUE
* - boolean caching enable or disable internal caching FALSE
* - boolean expose set the X-Powered-By header FALSE
*/
return array(
'base_url' => '/platform',
'index_file' => FALSE,
'charset' => 'utf-8',
'errors' => TRUE,
'profile' => FALSE,
'caching' => FALSE,
);

View File

@ -5,4 +5,5 @@ if docker ps | grep -q 'ushahidi$'; then
docker exec ushahidi sh -c 'cd /srv/ushahidi/platform && bin/ushahidi dataprovider incoming' >/dev/null
docker exec ushahidi sh -c 'cd /srv/ushahidi/platform && bin/ushahidi savedsearch' >/dev/null
docker exec ushahidi sh -c 'cd /srv/ushahidi/platform && bin/ushahidi notification queue' >/dev/null
docker exec ushahidi sh -c 'cd /srv/ushahidi/platform && bin/ushahidi webhook send' >/dev/null
fi