Merge branch 'master' of https://git.p2p.legal/chamalow/mazash into feature/fingerprint_return

Reviewed-on: #4

Dockerfile

@@ -1,39 +0,0 @@
-FROM debian:buster
-LABEL version 1.0+beta.2
-
-ENV JENKINS_HOME /var/jenkins
-ENV DEBIAN_FRONTEND noninteractive
-ENV REQUESTS_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
-
-#download through the french mirror
-RUN sed -i 's/deb\./ftp.fr./' /etc/apt/sources.list
-
-RUN echo "moonlight:/share/dev-common/Applications/x86-64/linux /mnt/applis nfs defaults 0 0" >> /etc/fstab && \
-    echo "moonlight:/share/home /home nfs defaults 0 0" >> /etc/fstab && \
-    echo "sharing:/mnt/samba/share /mnt/share nfs defaults 0 0" >> /etc/fstab
-
-# Global config
-# FIXME: nfs mounting hangs forever, so no path, etc...
-RUN echo "nslcd nslcd/ldap-base string dc=openldap,dc=ullink,dc=lan"    | debconf-set-selections && \
-    echo "nslcd nslcd/ldap-uris string ldap://ldap"                     | debconf-set-selections && \
-    echo "libnss-ldapd:amd64 libnss-ldapd/nsswitch multiselect group, passwd, shadow" | debconf-set-selections
-
-RUN apt-get upgrade -y && apt-get update
-RUN apt-get -y install \
-    git \
-    libnss-ldapd \
-    libpam-ldapd \
-    locales \
-    maven \
-    nfs-common \
-    ntp \
-    openjdk-8-jdk \
-    openssh-server \
-    python2.7 \
-    sudo \
-    supervisor \
-    unzip \
-    vim \
-    wget \
-    ca-certificates \
-    nginx \

docker-compose.yaml

@@ -8,8 +8,6 @@ services:
             - 8080:8080
         volumes:
             - data_ipfs:/data/ipfs
-        networks:
-            - db_networks
     db:
         image: postgres:10.7-alpine
         environment:
@@ -19,32 +17,24 @@ services:
             - PGDATA=/var/lib/postgresql/data/pgdata
         volumes:
             - data_postgresql:/var/lib/postgresql/data/pgdata
-        networks:
-            - db_networks
     python:
         build:
-            context: ./python
-        entrypoint: bash -c  "pip install -r requirements.txt &&  /code/run_app_prod.sh"
+            context: .
+            dockerfile: ./python/Dockerfile
+        entrypoint: bash -c  "/code/run_app_prod.sh"
         environment:
-            - DATABASE_HOST=mazash_db_1.mazash_db_networks
+            - DATABASE_HOST=db
             - DATABASE_DB=dejavu
             - DATABASE_USER=postgres
             - DATABASE_PASSWORD=password
             - DATABASE_TYPE=postgres
             - IPFS_HOST=/dns/ipfs/tcp/5001
-        volumes:
-            - .:/code
-        working_dir: /code
         ports:
             - 5000:5000
             - 8600:8600
         depends_on:
            - db
            - ipfs
-        networks:
-            - db_networks
-networks:
-    db_networks:
 volumes:
     data_ipfs:
     data_postgresql:

python/Dockerfile

@@ -7,6 +7,7 @@ RUN apt-get install \
     useradd -m app
 RUN pip install --upgrade pip
 RUN pip install numpy scipy matplotlib pydub pyaudio psycopg2 uwsgi
-RUN mkdir /code && chown app /code
 USER app
-WORKDIR /code
+WORKDIR /code
+COPY --chown=1000:1000 . /code
+RUN pip install -r requirements.txt

requirements.txt

@@ -15,7 +15,7 @@ flask_swagger_ui
 openapi_spec_validator
 
 #dejavu
-git+git://github.com/worldveil/dejavu@e56a4a221ad204654a191d217f92aebf3f058b62
+git+https://github.com/worldveil/dejavu@e56a4a221ad204654a191d217f92aebf3f058b62
 
 #ipfs
-git+git://github.com/ipfs-shipyard/py-ipfs-http-client.git@bcec97aa83cf0b0348d8e160c3f68dc8495dbc1b
+git+https://github.com/ipfs-shipyard/py-ipfs-http-client.git@bcec97aa83cf0b0348d8e160c3f68dc8495dbc1b