diff --git a/.drone.yml b/.drone.yml index 7a18b66..b008093 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,98 +4,98 @@ name: BB_PIPELINE steps: -# - name: deploy-container-db -# image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest -# environment: -# IMAGENAME: mariadb:10 -# CONTAINERNAME: bigbrotherdb -# COMMAND: create -# OVERWRITE: false -# PRIVATE: true -# CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD: -# from_secret: db_root_password -# CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE: -# from_secret: db_database -# CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER: -# from_secret: db_user -# CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD: -# from_secret: db_password -# -# - name: create-bigbrother-database -# image: python:latest -# commands: -# - cd database/ -# - pip3 install mariadb -# - python3 db-creation.py -# environment: -# MARIADB_USER: -# from_secret: db_user -# MARIADB_PASSWORD: -# from_secret: db_password -# MARIADB_DATABASE: -# from_secret: db_database -# 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: deploy-container-db + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: mariadb:10 + CONTAINERNAME: bigbrotherdb + COMMAND: create + OVERWRITE: false + PRIVATE: true + CODEFIRST_CLIENTDRONE_ENV_MARIADB_ROOT_PASSWORD: + from_secret: db_root_password + CODEFIRST_CLIENTDRONE_ENV_MARIADB_DATABASE: + from_secret: db_database + CODEFIRST_CLIENTDRONE_ENV_MARIADB_USER: + from_secret: db_user + CODEFIRST_CLIENTDRONE_ENV_MARIADB_PASSWORD: + from_secret: db_password + + - name: create-bigbrother-database + image: python:latest + commands: + - cd database/ + - pip3 install mariadb + - python3 db-creation.py + environment: + MARIADB_USER: + from_secret: db_user + MARIADB_PASSWORD: + from_secret: db_password + MARIADB_DATABASE: + from_secret: db_database + 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 - 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: 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 ] \ No newline at end of file + # - 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 ] \ No newline at end of file diff --git a/callback-server/app.js b/callback-server/app.js index 39a6ccb..6146746 100644 --- a/callback-server/app.js +++ b/callback-server/app.js @@ -26,8 +26,9 @@ app.get('/settings/deactivate', async (req,res) => { host: 'felixmielcarek-bigbrotherdb', user: process.env.MARIADB_USER, database: process.env.MARIADB_DATABASE, - password: process.env.MARIADB_PASSWORD - }); + password: process.env.MARIADB_PASSWORD, + connectionLimit: 5 +}); var authOptions = { url: 'https://accounts.spotify.com/api/token', method: 'post', json: true, @@ -68,8 +69,9 @@ app.get('/', async (req, res) => { host: 'felixmielcarek-bigbrotherdb', user: process.env.MARIADB_USER, database: process.env.MARIADB_DATABASE, - password: process.env.MARIADB_PASSWORD - }); + password: process.env.MARIADB_PASSWORD, + connectionLimit: 5 +}); const code = req.query.code; diff --git a/script/app.js b/script/app.js index 028b5da..50947b0 100644 --- a/script/app.js +++ b/script/app.js @@ -174,7 +174,8 @@ async function main() { host: 'felixmielcarek-bigbrotherdb', user: process.env.MARIADB_USER, database: process.env.MARIADB_DATABASE, - password: process.env.MARIADB_PASSWORD + password: process.env.MARIADB_PASSWORD, + connectionLimit: 5 }); let conn;