Skip to content

Commit

Permalink
Update travis script
Browse files Browse the repository at this point in the history
  • Loading branch information
cbeauchesne committed Dec 26, 2019
1 parent 64f4296 commit 4d72498
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
23 changes: 17 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dist: trusty
dist: xenial

env:
global:
Expand All @@ -14,24 +14,35 @@ services:
- redis-server

python:
- 3.4
- 3.7

addons:
postgresql: "9.4"
apt:
packages:
- postgresql-9.4-postgis-2.3
- postgresql-9.4-postgis-2.4

install:
- mkdir /tmp/elasticsearch
- wget -O - https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/2.3.2/elasticsearch-2.3.2.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
- /tmp/elasticsearch/bin/elasticsearch --daemonize --path.data /tmp

- curl -s -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.1.0-amd64.deb
- sudo dpkg -i --force-confnew elasticsearch-7.1.0-amd64.deb
- echo -e '-XX:+DisableExplicitGC\n-Djdk.io.permissionsUseCanonicalPath=true\n-Dlog4j.skipJansi=true\n-server\n' | sudo tee -a /etc/elasticsearch/jvm.options
- sudo chown -R elasticsearch:elasticsearch /etc/default/elasticsearch
- sudo systemctl start elasticsearch

# - mkdir /tmp/elasticsearch
# - wget -O - https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.1.0-linux-x86_64.tar.gz | tar xz --directory=/tmp/elasticsearch --strip-components=1
# - /tmp/elasticsearch/bin/elasticsearch --daemonize --path.data /tmp
- make -f config/travis .build/dev-requirements.timestamp
- make -f config/travis install


before_script:
# - sudo apt-get -qq update
# - sudo apt-get install postgresql-9.4-postgis-2.3 postgresql-9.4-postgis-scripts postgis -y -q
- echo "create user \"www-data\" with password 'www-data;'" | psql -U postgres
- PGUSER=postgres USER=travis scripts/create_user_db_test.sh
- sleep 10
- curl http://localhost:9200/

script:
Expand Down
11 changes: 0 additions & 11 deletions Dockerfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ WORKDIR /var/www/

RUN tar -xvf /tmp/project.tar && chown -R root:root /var/www

# ICI CONTINUER
RUN set -x \
&& apt-get -y --no-install-recommends install \
python3 \
Expand All @@ -41,21 +40,11 @@ RUN set -x \
gcc \
git

# ICI CONTINUER

RUN set -x \
&& make -f config/dev install \
&& py3compile -f -X '^.*gevent/_util_py2.py$' .build/venv/ \
&& rm -fr .cache \
&& apt-get -y purge \
python3-dev \
python3-pip \
libgeos-dev \
libffi-dev \
libpq-dev \
virtualenv \
gcc \
git \
&& apt-get -y --purge autoremove \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
Expand Down

0 comments on commit 4d72498

Please sign in to comment.