Merge pull request #11 from labteral/develop

fix docker image

docker/build.sh → build.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 source env.sh
-cd ../stopover && tar --dereference -c -f ../docker/stopover.tar * && cd ../docker
-docker build -t labteral/stopover-server:$STOPOVER_VERSION --build-arg ROCKSDB_VERSION=$ROCKSDB_VERSION .
+docker build -t labteral/stopover-server:$STOPOVER_VERSION --build-arg ROCKSDB_VERSION=$ROCKSDB_VERSION -f docker/Dockerfile .
 docker tag labteral/stopover-server:$STOPOVER_VERSION labteral/stopover-server:latest
-rm -f stopover.tar
+

docker/Dockerfile

@@ -39,7 +39,7 @@ RUN \
     && rm -rf init_pkgs current_pkgs /root/.cache/pip \
     && find / -type d -name __pycache__ -exec rm -r {} \+
 
-ADD stopover.tar /opt/stopover
 WORKDIR /opt/stopover
-
-ENTRYPOINT python server.py
+COPY . .
+RUN python setup.py install
+ENTRYPOINT python -m stopover_server

env.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+export STOPOVER_VERSION=$(cat stopover_server/version.py | grep version | cut -f2 -d\' | head -1 | xargs)
+export ROCKSDB_VERSION=6.10.2

stopover_server/__init__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from stopover import __version__
+from .version import __version__