Merge pull request #121 from tubone24/add_typescript

e2e test & circleci

.circleci/config.yml

@@ -13,8 +13,7 @@ jobs:
       - run: mkdir test-results && sudo chown -R circleci:circleci test-results
       - run:
           command: |
-            sudo pip install pipenv
-            pipenv install --pre
+            sudo pip install -r requirements.txt
       - save_cache:
           key: deps9-{{ .Branch }}-{{ checksum "Pipfile.lock" }}
           paths:
@@ -23,13 +22,13 @@ jobs:
             - "/usr/local/lib/python3.6/site-packages"
       - run:
           command: |
-            pipenv run "pip install -r requirements-test.txt"
-            pipenv run "pip install wheel"
-            pipenv run "python setup.py install"
-            pipenv run "coverage run --source=ebook_homebrew -m pytest --it --junit-xml=test-results/test_results.xml"
-            pipenv run "python setup.py sdist bdist_wheel"
+            pip install -r requirements-test.txt
+            pip install wheel
+            python setup.py install
+            coverage run --source=ebook_homebrew -m pytest --it --junit-xml=test-results/test_results.xml
+            python setup.py sdist bdist_wheel
       - store_test_results:
           path: test-results
       - store_artifacts:
           path: dist
-          destination: tr1
+          destination: tr1

Makefile

@@ -23,4 +23,13 @@ pypi-upload-test:
 pypi-upload:
 	twine upload --repository pypi dist/*
 
-.PHONY: all
+docker-build:
+	docker build -t ebook-homebrew docker
+
+docker-run:
+	docker run --rm --name ebook-homebrew -e PORT=8082 -p 8082:8082 ebook-homebrew
+
+docker-stop:
+	docker stop ebook-homebrew
+
+.PHONY: all

docker/Dockerfile

@@ -38,9 +38,9 @@ RUN pip3 install -r requirements.txt
 
 # setup vue client
 RUN rm ebook_homebrew/static/index.html
-RUN cd examples/ebook-homebrew-vue-client && git pull origin master
-RUN cd examples/ebook-homebrew-vue-client && npm install && npm run build
-RUN cp -R examples/ebook-homebrew-vue-client/dist/* ebook_homebrew/static/
+RUN cd examples/ebook-homebrew-vue-typescript-client && git pull origin master
+RUN cd examples/ebook-homebrew-vue-typescript-client && npm install && npm run build
+RUN cp -R examples/ebook-homebrew-vue-typescript-client/dist/* ebook_homebrew/static/
 
 # install ebook-homebrew
 RUN python3 setup.py install