Added production builds and fixed migration errors

Author: flavienbwk

.env.example

@@ -2,8 +2,6 @@ FLASK_API_VERSION="1.1"
 FLASK_SERVER_NAME="My API Project"
 FLASK_SERVER_DESCRIPTION="Dockerized Flask API boilerplate using an LDAP and token-based authentication"
 FLASK_SECRET_KEY="Some secret key"
-FLASK_LEVEL="dev" # dev, test or prod
-LOG_LEVEL="DEBUG" # DEBUG, INFO, WARNING or ERROR
 
 LDAP_ORGANISATION="My Company"
 LDAP_DOMAIN="mycompany.com"

.travis.yml

@@ -11,3 +11,4 @@ before_install:
 
 script:
     - docker-compose build
+    - docker-compose -f prod.docker-compose.yml build

README.md

@@ -36,6 +36,12 @@ Here you can take a look at the database architecture scheme :
 
 > Reminder : there is no `password` field because we use LDAP for authentication.
 
+## Why using LDAP authentication ?
+
+LDAP services are used in a lot of companies and institutions around the world to manage their user accounts and rights in a central place.
+
+With this boilerplate, you will be able to develop corporate-ready services AND avoid yourself the troubles of developing registration / password forgotten / change password / profile update code.
+
 ## Getting started (development)
 
 The API is made to run with an LDAP server for managing users. Whether use the provided Docker LDAP server or remove the conf. in [`docker-compose.yml`](./docker-compose.yml) and use your own LDAP server.
@@ -54,7 +60,7 @@ This section will explain to you how to run this project and set-up the LDAP ser
 
 2. Change the database/LDAP passwords and keys in `.env`
 
-    You can now run :
+    Then run :
 
     ```bash
     docker-compose up ldap phpldapadmin database adminer -d
@@ -93,19 +99,11 @@ docker-compose up --build -d api
 
 :clock9: NPM's initial install may take quite a lot of time
 
-Start the app :
-
 ```bash
 # Expect several minutes for first launch (npm install)
 docker-compose up --build -d app
 ```
 
-You can now enjoy the app on [`http://localhost:8080`](http://localhost:8080)
+Enjoy the app on [`http://localhost:8080`](http://localhost:8080)
 
 > :information_source: If you want to add a NPM package, just stop & re-launch `docker-compose up app`.
-
-## Why using LDAP authentication ?
-
-LDAP services are used in a lot of companies and institutions around the world to manage their user accounts and rights in a central place.
-
-With this boilerplate, you will be able to develop corporate-ready services AND avoid yourself the troubles of developing registration / password forgotten / change password / profile update code.

api/app/manager.py

@@ -16,7 +16,7 @@
 app.app_context().push()
 
 manager = Manager(app)
-migrate = Migrate(app, database.getDatabase())
+migrate = Migrate(app, database.getDatabase(), "/migrations")
 manager.add_command('db', MigrateCommand)
 
 # Commands

api/entrypoint.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+# These commands are here because they must be run at runtime
 
 python /app/manager.py db init
 

api/prod.Dockerfile

@@ -0,0 +1,20 @@
+FROM python:3.7-alpine
+
+# python-ldap requirements
+RUN apk update && apk add openldap-dev libc-dev gcc g++
+
+# psycopg2 requirements
+RUN apk add libpq python3-dev musl-dev postgresql-dev
+
+COPY ./requirements.txt .
+RUN pip install -r requirements.txt
+
+# Install WSGI server
+RUN pip install gunicorn==20.1.0
+
+WORKDIR /app
+COPY ./app /app
+
+# Run migrations and WSGI server
+COPY ./prod.entrypoint.sh /entrypoint.sh
+ENTRYPOINT [ "/entrypoint.sh" ]

api/prod.entrypoint.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+# These commands are here because they must be run at runtime
+
+python /app/manager.py db init
+
+python /app/manager.py db migrate --message 'initial database migration'
+python /app/manager.py db upgrade
+
+gunicorn manager:app -b 0.0.0.0:5000

app/prod.Dockerfile

@@ -0,0 +1,14 @@
+FROM node:13.0.1-alpine
+
+ARG NODE_ENV
+
+COPY ./app /app
+
+WORKDIR '/app'
+RUN npm install
+RUN npm run build --production
+
+RUN npm install -g serve
+
+EXPOSE 3000
+ENTRYPOINT ["serve", "-l", "tcp://0.0.0.0:3000", "-s", "/app/build"]

docker-compose.yml

@@ -8,9 +8,6 @@ services:
   ldap:
     image: osixia/openldap:1.3.0
     restart: always
-    ports:
-        - 389:389
-        - 636:636
     env_file:
       - .env
     volumes:
@@ -61,6 +58,9 @@ services:
       - 5000:5000
     env_file:
       - .env
+    environment:
+      FLASK_LEVEL: "dev" # dev, test or prod
+      LOG_LEVEL: "DEBUG" # DEBUG, INFO, WARNING or ERROR
     depends_on:
       - ldap
       - database

prod.docker-compose.yml

@@ -0,0 +1,87 @@
+version: "3.3"
+
+services:
+
+
+  # LDAP-related
+
+  ldap:
+    image: osixia/openldap:1.3.0
+    restart: always
+    env_file:
+      - .env
+    volumes:
+        - ldap_data:/var/lib/ldap
+        - ldap_slapd:/etc/ldap/slapd.d
+
+  phpldapadmin:
+    image: osixia/phpldapadmin:0.9.0
+    restart: always
+    ports:
+        - 8081:443
+    environment: 
+        PHPLDAPADMIN_LDAP_HOSTS: ldap
+    depends_on: 
+      - ldap
+
+
+  # Database-related
+
+  database:
+    image: postgres:12.2-alpine
+    restart: always
+    env_file:
+      - .env
+    volumes:
+      - database:/var/lib/postgresql/data
+
+
+  # Service-related
+
+  api:
+    build:
+      context: ./api
+      dockerfile: prod.Dockerfile
+    image: flavienb/reactjs-flask-ldap-boilerplate-api:latest
+    restart: always
+    volumes:
+      - api_logs:/logs
+      - api_migrations:/migrations
+    env_file:
+      - .env
+    environment:
+      FLASK_LEVEL: "dev" # dev, test or prod
+      LOG_LEVEL: "DEBUG" # DEBUG, INFO, WARNING or ERROR
+    depends_on:
+      - ldap
+      - database
+
+  app:
+    build:
+      context: ./app
+      dockerfile: prod.Dockerfile
+    image: flavienb/reactjs-flask-ldap-boilerplate-app:latest
+    restart: always
+    environment:
+      NODE_ENV: "production"
+      CHOKIDAR_USEPOLLING: "false"
+
+  # We set-up NGINX to have a unique endpoint for app & api
+  nginx:
+    build:
+      context: ./nginx
+      dockerfile: prod.Dockerfile
+    image: flavienb/reactjs-flask-ldap-boilerplate-nginx:latest
+    restart: always
+    ports:
+      - "8080:80"
+    volumes:
+      - nginx_logs:/var/log/nginx
+
+volumes:
+  api_logs:
+  nginx_logs:
+  database:
+  ldap_data:
+  ldap_slapd:
+  api_migrations: