Merge pull request #3 from code-lts/improvements

Improvements and cleanups

Author: svetlyak40wt

.bowerrc

@@ -1,11 +1,10 @@
 env
 dumps
 node_modules
-bower_components
 fake
 tmp
 logs
 secure_settings.py
 load-tests
 .git
-.tox
+.tox

.dockerignore

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[Makefile]
+indent_style = tab
+indent_size = 4

.editorconfig

@@ -42,7 +42,6 @@ nosetests.xml
 *.csv
 \#*
 /.hash-before-release
-/bower_components/
 /dumps/
 /fake/
 /tmp/
@@ -51,4 +50,4 @@ nosetests.xml
 /.env
 /env-to-remove/
 .tern-port
-/.env-debug-amch-client
+/.env-debug-amch-client

.gitignore

@@ -1,7 +1,6 @@
-FROM ubuntu:14.04
-MAINTAINER Alexander Artemenko <svetlyak.40wt@gmail.com>
+FROM python:2-slim
+LABEL MAINTAINER="Alexander Artemenko <svetlyak.40wt@gmail.com>"
 
-# Prepare
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && \
@@ -12,34 +11,17 @@ RUN apt-get update && \
             libssl-dev \
             libxml2-dev \
             libxslt1-dev \
-            mysql-client-core-5.5 \
-            libmysqlclient-dev \
+            mariadb-client \
+            default-libmysqlclient-dev \
             libffi-dev \
             git \
             mercurial \
             python-qt4 \
             xvfb
 
-RUN virtualenv --python=python2 /env
-RUN /env/bin/pip install pip==8.0.2
-
-#COPY ./wheelhouse /wheelhouse
 COPY ./requirements/dev.txt /requirements.txt
 COPY ./requirements/from-git.txt /requirements-from-git.txt
 
-# disable wheelhouse for Drone builds
-# RUN /env/bin/pip install --use-wheel --no-index --find-links=/wheelhouse -r /requirements.txt
-RUN /env/bin/pip install -r /requirements.txt
-RUN /env/bin/pip install -r /requirements-from-git.txt
-
-COPY . /app
-WORKDIR /app
-
-RUN find . -name '*.pyc' -print0 | xargs -0 rm -f
-RUN /env/bin/pip install -e /app
-
-ENV PATH=/env/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-COPY ./configs/.pdbrc.py /root/
-
-#ENTRYPOINT ["./manage.py"]
+RUN pip install --upgrade pip
+RUN pip install -r /requirements.txt
+RUN pip install -r /requirements-from-git.txt

Dockerfile

@@ -0,0 +1,72 @@
+.PHONY: all build_static get_latest_db restore_db backup_dev_db create_postgres drop_postgres connect_to_postgres create_database drop_database dbshell push_to_amch build_wheels build_image push_image migrate
+
+CURRENT_VERSION = `cat CURRENT_VERSION`
+
+all:
+	@echo "Current version: ${CURRENT_VERSION}"
+
+build_static: # Build static javascript and css files.
+	yarn run gulp
+
+get_latest_db:
+	scp clupea:/mnt/yandex.disk/backups/mysql/allmychanges/latest.sql.bz2 dumps/
+
+RESTORE_DB = 'latest'
+restore_db:
+	docker exec -ti mysql.allmychanges.com /dumps/restore.sh ${RESTORE_DB}
+
+backup_dev_db:
+	docker exec mysql.allmychanges.com mysqldump  -ppassword allmychanges > dumps/dev.sql
+
+create_postgres:
+    # https://hub.docker.com/_/postgres/
+    # how to run psql
+    # $
+	docker exec -it postgres.allmychanges.com postgresadmin -ppassword create allmychanges
+
+drop_postgres:
+	docker exec -it postgres.allmychanges.com postgresadmin -ppassword drop allmychanges
+	create_postgres
+
+connect_to_postgres:
+	docker run -it --net amch --rm postgres \
+		sh -c 'exec psql -h postgres.allmychanges.com -p 5432 -U postgres'
+
+create_database:
+	docker exec -it mysql.allmychanges.com mysqladmin -ppassword create allmychanges
+
+drop_database:
+	docker exec -it mysql.allmychanges.com mysqladmin -ppassword drop allmychanges
+	create_database
+
+dbshell:
+	docker exec -it mysql.allmychanges.com mysql -ppassword allmychanges
+
+push_to_amch:
+	time pip2amch --tag allmychanges.com requirements/production.txt | amch push
+
+build_wheels:
+	docker run --rm -v `pwd`:/wheels 40ants/wheel-builder --wheel-dir wheelhouse -r requirements/dev.txt
+
+DEV_TAG = 'allmychanges.com:dev'
+build_image:
+	docker build ./ -t ${DEV_TAG}
+	@echo "Built ${DEV_TAG}"
+
+TAG = "registry.40ants.com:5000/allmychanges.com:${CURRENT_VERSION}"
+push_image:
+	@echo "Using tag: ${TAG}"
+	docker build ./ -t ${TAG}
+	docker push ${TAG}
+	@echo "Pushed ${TAG}"
+
+update_requirements:
+	pip-compile --annotate requirements.in
+	pip-compile --annotate requirements-dev.in
+
+SERVER_PORT=80
+run_server:
+	python ./manage.py runserver 0.0.0.0:${SERVER_PORT}
+
+migrate:
+	python ./manage.py migrate