felix.mielcarek
/
big-brother
mirror of https://github.com/felixmielcarek/big-brother
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding DB connection limit
continuous-integration/drone/push Build is passing Details

Browse Source
main
Félix MIELCAREK 11 months ago
parent c1bde67c88
commit 04c9656ac0
3 changed files with 101 additions and 98 deletions
Show Stats Download Patch File Download Diff File

142
.drone.yml
Unescape View File

@ -4,88 +4,56 @@ name: BB_PIPELINE
steps: steps:
# - name: deploy-container-db - name: deploy-container-db
# image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
# environment: environment:
# IMAGENAME: mariadb:10 IMAGENAME: mariadb:10
# CONTAINERNAME: bigbrotherdb CONTAINERNAME: bigbrotherdb
# COMMAND: create COMMAND: create
# OVERWRITE: false OVERWRITE: false
# PRIVATE: true PRIVATE: true
# CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD: CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD:
# from_secret: db_root_password from_secret: db_root_password
# CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE: CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE:
# from_secret: db_database from_secret: db_database
# CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER: CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER:
# from_secret: db_user from_secret: db_user
# CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD: CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD:
# from_secret: db_password from_secret: db_password
#
# - name: create-bigbrother-database - name: create-bigbrother-database
# image: python:latest image: python:latest
# commands: commands:
# - cd database/ - cd database/
# - pip3 install mariadb - pip3 install mariadb
# - python3 db-creation.py - python3 db-creation.py
# environment: environment:
# MARIADB_USER: MARIADB_USER:
# from_secret: db_user from_secret: db_user
# MARIADB_PASSWORD: MARIADB_PASSWORD:
# from_secret: db_password from_secret: db_password
# MARIADB_DATABASE: MARIADB_DATABASE:
# from_secret: db_database from_secret: db_database
# depends_on: [ deploy-container-db ] depends_on: [ deploy-container-db ]
#
# - name: build-image-server
# image: plugins/docker
# settings:
# dockerfile: callback-server/Dockerfile
# context: ./
# registry: hub.codefirst.iut.uca.fr
# repo: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother-server
# username:
# from_secret: SECRET_REGISTRY_USERNAME
# password:
# from_secret: SECRET_REGISTRY_PASSWORD
# depends_on: [ create-bigbrother-database ]
#
# - name: deploy-container-server
# image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
# environment:
# IMAGENAME: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother-server:latest
# CONTAINERNAME: bigbrotherserver
# COMMAND: create
# OVERWRITE: true
# MARIADB_USER:
# from_secret: db_user
# MARIADB_PASSWORD:
# from_secret: db_password
# MARIADB_DATABASE:
# from_secret: db_database
# CLIENT_ID:
# from_secret: spotify_client_id
# CLIENT_SECRET:
# from_secret: spotify_client_id
# depends_on: [ build-image-server ]
- name: build-image-script - name: build-image-server
image: plugins/docker image: plugins/docker
settings: settings:
dockerfile: script/Dockerfile dockerfile: callback-server/Dockerfile
context: ./ context: ./
registry: hub.codefirst.iut.uca.fr registry: hub.codefirst.iut.uca.fr
repo: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother repo: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother-server
username: username:
from_secret: SECRET_REGISTRY_USERNAME from_secret: SECRET_REGISTRY_USERNAME
password: password:
from_secret: SECRET_REGISTRY_PASSWORD from_secret: SECRET_REGISTRY_PASSWORD
#depends_on: [ create-bigbrother-database ] depends_on: [ create-bigbrother-database ]
- name: deploy-container-script - name: deploy-container-server
image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
environment: environment:
IMAGENAME: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother:latest IMAGENAME: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother-server:latest
CONTAINERNAME: bigbrotherscript CONTAINERNAME: bigbrotherserver
COMMAND: create COMMAND: create
OVERWRITE: true OVERWRITE: true
MARIADB_USER: MARIADB_USER:
@ -98,4 +66,36 @@ steps:
from_secret: spotify_client_id from_secret: spotify_client_id
CLIENT_SECRET: CLIENT_SECRET:
from_secret: spotify_client_id from_secret: spotify_client_id
depends_on: [ build-image-script ] depends_on: [ build-image-server ]
# - name: build-image-script
# image: plugins/docker
# settings:
# dockerfile: script/Dockerfile
# context: ./
# registry: hub.codefirst.iut.uca.fr
# repo: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother
# username:
# from_secret: SECRET_REGISTRY_USERNAME
# password:
# from_secret: SECRET_REGISTRY_PASSWORD
# #depends_on: [ create-bigbrother-database ]
# - name: deploy-container-script
# image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
# environment:
# IMAGENAME: hub.codefirst.iut.uca.fr/felix.mielcarek/big-brother:latest
# CONTAINERNAME: bigbrotherscript
# COMMAND: create
# OVERWRITE: true
# MARIADB_USER:
# from_secret: db_user
# MARIADB_PASSWORD:
# from_secret: db_password
# MARIADB_DATABASE:
# from_secret: db_database
# CLIENT_ID:
# from_secret: spotify_client_id
# CLIENT_SECRET:
# from_secret: spotify_client_id
# depends_on: [ build-image-script ]

10
callback-server/app.js
Unescape View File

@ -26,8 +26,9 @@ app.get('/settings/deactivate', async (req,res) => {
host: 'felixmielcarek-bigbrotherdb', host: 'felixmielcarek-bigbrotherdb',
user: process.env.MARIADB_USER, user: process.env.MARIADB_USER,
database: process.env.MARIADB_DATABASE, database: process.env.MARIADB_DATABASE,
password: process.env.MARIADB_PASSWORD password: process.env.MARIADB_PASSWORD,
}); connectionLimit: 5
});
var authOptions = { var authOptions = {
url: 'https://accounts.spotify.com/api/token', method: 'post', json: true, url: 'https://accounts.spotify.com/api/token', method: 'post', json: true,
@ -68,8 +69,9 @@ app.get('/', async (req, res) => {
host: 'felixmielcarek-bigbrotherdb', host: 'felixmielcarek-bigbrotherdb',
user: process.env.MARIADB_USER, user: process.env.MARIADB_USER,
database: process.env.MARIADB_DATABASE, database: process.env.MARIADB_DATABASE,
password: process.env.MARIADB_PASSWORD password: process.env.MARIADB_PASSWORD,
}); connectionLimit: 5
});
const code = req.query.code; const code = req.query.code;

3
script/app.js
Unescape View File

@ -174,7 +174,8 @@ async function main() {
host: 'felixmielcarek-bigbrotherdb', host: 'felixmielcarek-bigbrotherdb',
user: process.env.MARIADB_USER, user: process.env.MARIADB_USER,
database: process.env.MARIADB_DATABASE, database: process.env.MARIADB_DATABASE,
password: process.env.MARIADB_PASSWORD password: process.env.MARIADB_PASSWORD,
connectionLimit: 5
}); });
let conn; let conn;

Write Preview
Loading…
Cancel
Save