Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
humanities
gargantext
Commits
e0e972b1
Commit
e0e972b1
authored
Apr 28, 2016
by
delanoe
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'refactoring' into constance-docker
parents
ac7f70bf
bdb5e3ed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
44 deletions
+44
-44
Dockerfile
install/docker/dev/Dockerfile
+43
-43
about.html
templates/pages/main/about.html
+1
-1
No files found.
install/docker/dev/Dockerfile
View file @
e0e972b1
...
...
@@ -8,56 +8,56 @@
###########################################################
# https://docs.docker.com/compose/django/
######################################################################
#
FROM debian:stretch
FROM
gargantext
FROM
debian:stretch
#
FROM gargantext
MAINTAINER
ISCPIF <alexandre.delanoe@iscpif.fr>
######################################################################
USER
root
#RUN apt-get update && \
# apt-get install -y \
# apt-utils ca-certificates locales man dialog\
# sudo aptitude gcc g++ wget git postgresql-9.5 vim
#
#### Configure timezone and locale
#RUN echo "Europe/Paris" > /etc/timezone && \
# dpkg-reconfigure -f noninteractive tzdata && \
# sed -i -e 's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/' /etc/locale.gen && \
# sed -i -e 's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/' /etc/locale.gen && \
# echo 'LANG="fr_FR.UTF-8"' > /etc/default/locale && \
# dpkg-reconfigure --frontend=noninteractive locales && \
# update-locale LANG=fr_FR.UTF-8
#
#### Install Database, main dependencies and Python
#### (installing some Debian version before pip to get dependencies)
#RUN apt-get update && apt-get install -y \
# postgresql-server-dev-9.5 libpq-dev libxml2 \
# libxml2-dev xml-core libgfortran-5-dev \
# virtualenv python3-virtualenv \
# python3.4 python3.4-dev \
# python3.5 python3.5-dev \
# python3-six python3-numpy python3-setuptools \
# # ^for numpy, pandas
# python3-numexpr \
# # ^ for numpy performance
# libxml2-dev libxslt-dev
# # ^ for lxml
#
#### PROD VERSION OF GARGANTEXT ONLY
##RUN apt-get install -y uwsgi nginx uwsgi-plugin-python rabbitmq-server
##
### ## CREATE USER and adding it to sudo
### ## TODO ask user for password
#RUN adduser --disabled-password --gecos "" gargantua
#
#RUN apt-get install -y sudo && adduser gargantua sudo \
# && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
RUN
apt-get update
&&
\
apt-get
install
-y
\
apt-utils ca-certificates locales man dialog
\
sudo
aptitude gcc g++ wget git postgresql-9.5 vim
### Configure timezone and locale
RUN
echo
"Europe/Paris"
>
/etc/timezone
&&
\
dpkg-reconfigure
-f
noninteractive tzdata
&&
\
sed
-i
-e
's/# en_GB.UTF-8 UTF-8/en_GB.UTF-8 UTF-8/'
/etc/locale.gen
&&
\
sed
-i
-e
's/# fr_FR.UTF-8 UTF-8/fr_FR.UTF-8 UTF-8/'
/etc/locale.gen
&&
\
echo
'LANG="fr_FR.UTF-8"'
>
/etc/default/locale
&&
\
dpkg-reconfigure
--frontend
=
noninteractive locales
&&
\
update-locale
LANG
=
fr_FR.UTF-8
### Install Database, main dependencies and Python
### (installing some Debian version before pip to get dependencies)
RUN
apt-get update
&&
apt-get
install
-y
\
postgresql-server-dev-9.5 libpq-dev libxml2
\
libxml2-dev xml-core libgfortran-5-dev
\
virtualenv python3-virtualenv
\
python3.4 python3.4-dev
\
python3.5 python3.5-dev
\
python3-six python3-numpy python3-setuptools
\
# ^for numpy, pandas
python3-numexpr \
# ^ for numpy performance
libxml2-dev libxslt-dev
# ^ for lxml
### PROD VERSION OF GARGANTEXT ONLY
#RUN apt-get install -y uwsgi nginx uwsgi-plugin-python rabbitmq-server
#
## ## CREATE USER and adding it to sudo
## ## TODO ask user for password
RUN
adduser
--disabled-password
--gecos
""
gargantua
######################################################################
## CONFIGURE POSTGRESQL
######################################################################
RUN
apt-get
install
-y
sudo
&&
adduser gargantua
sudo
\
&&
echo
'%sudo ALL=(ALL) NOPASSWD:ALL'
>>
/etc/sudoers
#####################################################################
# CONFIGURE POSTGRESQL
#####################################################################
RUN
sed
-iP
"s%^data_directory.*%data_directory =
\'\/
srv
\/
gargantext_data
\'
%"
/etc/postgresql/9.5/main/postgresql.conf
...
...
templates/pages/main/about.html
View file @
e0e972b1
...
...
@@ -39,7 +39,7 @@
<li>
Version 3.0.0
<ul>
<li>
[NAME] Blue
Mustard
</li>
<li>
[NAME] Blue
Jasmine
</li>
<li>
[CODE] Refactored
</li>
<li>
[DATABASE] New schema
</li>
</ul>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment