Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Docker Tripal
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
applied-bioinformatics
Docker Tripal
Commits
f7ae5758
Commit
f7ae5758
authored
5 years ago
by
Anthony Bretaudeau
Browse files
Options
Downloads
Patches
Plain Diff
update drupal + make elasticsearchhost configurable
parent
5a12e986
Branches
v2.x
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Dockerfile
+3
-2
3 additions, 2 deletions
Dockerfile
etc/tripal/settings.php
+1
-1
1 addition, 1 deletion
etc/tripal/settings.php
with
4 additions
and
3 deletions
Dockerfile
+
3
−
2
View file @
f7ae5758
...
...
@@ -35,8 +35,8 @@ RUN a2enmod rewrite && a2enmod proxy && a2enmod proxy_http
RUN
cd
/tmp
&&
git clone https://github.com/php/pecl-php-uploadprogress.git
&&
cd
pecl-php-uploadprogress
&&
phpize
&&
./configure
&&
make
&&
make
install
&&
cd
/
# Download Drupal from ftp.drupal.org
ENV
DRUPAL_VERSION=7.6
7
ENV
DRUPAL_TARBALL_MD5=
78b1814e55fdaf40e753fd523d059f8d
ENV
DRUPAL_VERSION=7.6
9
ENV
DRUPAL_TARBALL_MD5=
292290a2fb1f5fc919291dc3949cdf7c
WORKDIR
/var/www
RUN
rm
-R
html
\
&&
curl
-OsS
https://ftp.drupal.org/files/projects/drupal-
${
DRUPAL_VERSION
}
.tar.gz
\
...
...
@@ -71,6 +71,7 @@ ENV BASE_URL_PATH="/tripal" \
ENABLE_OP_CACHE=1 \
ENABLE_MEMCACHE=1 \
ENABLE_CRON_JOBS=0 \
ELASTICSEARCH_HOST="elasticsearch" \
TRIPAL_GIT_UPDATE=1 \
TRIPAL_BASE_CODE_GIT="https://github.com/tripal/tripal.git[@00ed8867845aae4fe8fc14b3d426b95cd7b790b4]" \
TRIPAL_GIT_CLONE_MODULES="https://github.com/abretaud/tripal_rest_api.git[@c6f9021ea5d4c6d7c67c5bd363a7dd9359228bbc] https://github.com/tripal/tripal_elasticsearch.git[@dc7f276046e394a80a7dfc9404cf1a149006eb2a] https://github.com/tripal/trpdownload_api.git" \
...
...
This diff is collapsed.
Click to expand it.
etc/tripal/settings.php
+
1
−
1
View file @
f7ae5758
...
...
@@ -21,7 +21,7 @@ $conf['mail_system'] = ['default-system' => 'TestingMailSystem'];
/**
* Default elasticsearch host
*/
$conf
[
'elasticsearch_host'
]
=
'elasticsearch'
;
$conf
[
'elasticsearch_host'
]
=
getenv
(
'ELASTICSEARCH_HOST'
)
;
/**
* Caching
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment