apptension · jakubsztyma · Nov 5, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,33 @@
-language: python
-python:
-  - "3.6"
-install:
-  - pip install pipenv
-  - pipenv install --dev
+
+services:
+  - docker
+
+env:
+  - secure: "ir3jXjYj2rstjhCTu6dbSZJb6JWiwE+VhoAY1z5KumilS8OU1rSytNyoxNMElcatzzfGYvwwCuh4M8iY5NbtDvWnHGvUXxcuZAKDSZ96bM9QNXlOzTNuRjwl9aQN2majkZCY2irRDmuAVoxodkNxavtw71D9jru5bv0J2kZdvobIjrTLHCj1kpbbxGgzWQz+2pRoX1sL3k7X17sKsf6i+7fG04OgaL1xKgLt2caaD7keAnt7vU8kk3gM2RtFwZHM8+qbnNVDT/lwKSHmjX+8J531F4rqAnPquGqUrOGmfhd6Nu5FG3n3x5/8axBfi+l04/c8lWO4MUCGSxZW6Rwx30HxXKgwff2yHgAo9yYWnOuri5rbDDiemhF7zRXeAl650usI4headAQK7S1q323/3AX+7vueL9L66Wg8u64ywY5EvqwoSBT7AgzvItqXI+PrSMGTimx9k0rMrLDOV0hMERzKaTO9qJb2Em5LNWBWAE76InGSD9F63PxL1NseDSjLHvYHM/dDflaTJBCWY5KMhO9jtqlT9jzu6gUDIzPQvXuusNo8a0V7giQ3vrB4vCLUSN9FUPN/kB5D/xzgAnKgm1gWXqdUoHF17XQxBqfdh0StefNP/5c/7UEFgQ8qgFUgclv4oWB3QN0Qv9V75JYJdcALdVHbz/1w5RgyxttXYVg="
+
+before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y install docker-ce
+  - docker --version
+  - sudo rm /usr/local/bin/docker-compose
+  - curl -L https://github.com/docker/compose/releases/download/1.20.1/docker-compose-`uname -s`-`uname -m` > docker-compose
+  - chmod +x docker-compose
+  - sudo mv docker-compose /usr/local/bin
+  - docker-compose --version
+
+#install:
+#  - docker-compose up
+
 script:
-  - pipenv run pytest
+#  - docker-compose exec backend pytest
+  - docker build -t backend ./backend
+  - docker images
+  - docker login -u "sztymajakub" -p "$HUB_PASSWORD" https://index.docker.io/v1/
+
+deploy:
+  provider: script
+  script: bash docker_push.sh
+  on:
+    branch: master
diff --git a/README.md b/README.md
@@ -2,6 +2,34 @@
 
 [![Build Status](https://travis-ci.org/apptension/django-restauth.svg?branch=master)](https://travis-ci.org/apptension/django-restauth)
 
+
+## Runing on DigitalOcean
+```
+Here we use a database on a pod to avoid paying for managed database.
+Normally a managed database should be used to run on DigitalOcean.
+```
+#### Create pods and services
+```
+kubectl apply -f kubernetes
+```
+#### Create a database on a pod
+```
+kubectl exec db bash
+su postgres
+psql
+create database dev;
+```
+#### Run migrations
+```
+kubectl exec [dev pod name] bash
+./manage.py migrate
+./manage.py runserver 0:8000
+```
+### Test deployment
+```
+curl http://[load balancer external IP]:8080
+```
+
 ## Running
 
 ```

diff --git a/.env.example → backend/.env.example b/.env.example → backend/.env.example
diff --git a/Dockerfile → backend/Dockerfile b/Dockerfile → backend/Dockerfile
@@ -15,6 +15,6 @@ COPY Pipfile Pipfile.lock ./
 RUN pip install --upgrade pip
 RUN pip install pipenv
 RUN pipenv install --system --dev
-COPY . .
+COPY locale .
 
 CMD ["./run-backend.sh"]
diff --git a/Pipfile → backend/Pipfile b/Pipfile → backend/Pipfile
diff --git a/Pipfile.lock → backend/Pipfile.lock b/Pipfile.lock → backend/Pipfile.lock
diff --git a/locale/error_codes/LC_MESSAGES/django.mo → .../locale/error_codes/LC_MESSAGES/django.mo b/locale/error_codes/LC_MESSAGES/django.mo → .../locale/error_codes/LC_MESSAGES/django.mo
diff --git a/locale/error_codes/LC_MESSAGES/django.po → .../locale/error_codes/LC_MESSAGES/django.po b/locale/error_codes/LC_MESSAGES/django.po → .../locale/error_codes/LC_MESSAGES/django.po
diff --git a/manage.py → backend/manage.py b/manage.py → backend/manage.py
diff --git a/pytest.ini → backend/pytest.ini b/pytest.ini → backend/pytest.ini
diff --git a/restauth/__init__.py → backend/restauth/__init__.py b/restauth/__init__.py → backend/restauth/__init__.py
diff --git a/restauth/admin.py → backend/restauth/admin.py b/restauth/admin.py → backend/restauth/admin.py
diff --git a/restauth/apps.py → backend/restauth/apps.py b/restauth/apps.py → backend/restauth/apps.py
diff --git a/restauth/jwt.py → backend/restauth/jwt.py b/restauth/jwt.py → backend/restauth/jwt.py
diff --git a/restauth/migrations/0001_initial.py → backend/restauth/migrations/0001_initial.py b/restauth/migrations/0001_initial.py → backend/restauth/migrations/0001_initial.py
diff --git a/restauth/migrations/__init__.py → backend/restauth/migrations/__init__.py b/restauth/migrations/__init__.py → backend/restauth/migrations/__init__.py
diff --git a/restauth/models.py → backend/restauth/models.py b/restauth/models.py → backend/restauth/models.py
diff --git a/restauth/notifications.py → backend/restauth/notifications.py b/restauth/notifications.py → backend/restauth/notifications.py
diff --git a/restauth/serializers.py → backend/restauth/serializers.py b/restauth/serializers.py → backend/restauth/serializers.py
diff --git a/restauth/settings.py → backend/restauth/settings.py b/restauth/settings.py → backend/restauth/settings.py
@@ -109,7 +109,7 @@
 AUTH_USER_MODEL = 'restauth.User'
 
 LOCALE_PATHS = [
-    os.path.join(BASE_DIR, 'locale')
+    os.path.join(BASE_DIR, '../../locale')
 ]
 
 REST_FRAMEWORK = {

diff --git a/restauth/tests/__init__.py → backend/restauth/tests/__init__.py b/restauth/tests/__init__.py → backend/restauth/tests/__init__.py
diff --git a/restauth/tests/conftest.py → backend/restauth/tests/conftest.py b/restauth/tests/conftest.py → backend/restauth/tests/conftest.py
diff --git a/restauth/tests/factories.py → backend/restauth/tests/factories.py b/restauth/tests/factories.py → backend/restauth/tests/factories.py
diff --git a/restauth/tests/tests.py → backend/restauth/tests/tests.py b/restauth/tests/tests.py → backend/restauth/tests/tests.py
diff --git a/restauth/tokens.py → backend/restauth/tokens.py b/restauth/tokens.py → backend/restauth/tokens.py
diff --git a/restauth/urls.py → backend/restauth/urls.py b/restauth/urls.py → backend/restauth/urls.py
diff --git a/restauth/utils.py → backend/restauth/utils.py b/restauth/utils.py → backend/restauth/utils.py
diff --git a/restauth/views.py → backend/restauth/views.py b/restauth/views.py → backend/restauth/views.py
diff --git a/restauth/wsgi.py → backend/restauth/wsgi.py b/restauth/wsgi.py → backend/restauth/wsgi.py
diff --git a/backend/run-backend.sh b/backend/run-backend.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+echo 'Hello'
+./wait-for-it.sh db:5432
+python manage.py migrate
+python manage.py runserver 0:8080
diff --git a/wait-for-it.sh → backend/wait-for-it.sh b/wait-for-it.sh → backend/wait-for-it.sh
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,7 +19,7 @@ services:
     depends_on:
       - "db"
     restart: on-failure
-    env_file: .env
+    env_file: .env.example
 
 volumes:
   restauth_backend:

diff --git a/docker_push.sh b/docker_push.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+docker tag backend sztymajakub/main
+docker push sztymajakub/main
diff --git a/kubernetes/db-deployment.yaml b/kubernetes/db-deployment.yaml
@@ -0,0 +1,37 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  annotations:
+    kompose.cmd: kompose convert
+    kompose.version: 1.19.0 ()
+  creationTimestamp: null
+  labels:
+    app: v1
+  name: dev
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: v1
+  strategy: {}
+  template:
+    metadata:
+      annotations:
+        kompose.cmd: kompose convert
+        kompose.version: 1.19.0 ()
+      creationTimestamp: null
+      labels:
+        app: v1
+    spec:
+      containers:
+      - image: sztymajakub/main:latest
+        name: dev
+        ports:
+        - containerPort: 8080
+        envFrom:
+          - configMapRef:
+              name: cm
+        args:
+        - ./run_django.sh
+        imagePullPolicy: Always
+status: {}
diff --git a/kubernetes/db-pod.yaml b/kubernetes/db-pod.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  creationTimestamp: null
+  labels:
+    app: db
+  name: db
+spec:
+  containers:
+  - image: postgres:9.6
+    name: db
+    ports:
+    - containerPort: 5432
+    resources: {}
+  restartPolicy: OnFailure
+status: {}
diff --git a/kubernetes/db-service.yaml b/kubernetes/db-service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: db
+spec:
+  selector:
+    app: db
+  ports:
+  - name: "5432"
+    port: 5432
+    targetPort: 5432
+status:
+  loadBalancer: {}
diff --git a/kubernetes/dev-service.yaml b/kubernetes/dev-service.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: dev-svc
+spec:
+  selector:
+    app: dev
+  ports:
+    - protocol: TCP
+      port: 8080
+      targetPort: 8080
diff --git a/kubernetes/load-balancer.yaml b/kubernetes/load-balancer.yaml
@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: lb
+spec:
+  selector:
+    app: v1
+  ports:
+    - port: 8080
+      targetPort: 8080
+  type: LoadBalancer