diff --git a/.drone.yml b/.drone.yml index 7c91da7..4d161c3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -74,4 +74,21 @@ steps: CONTAINERNAME: php_script COMMAND: create OVERWRITE: true - depends_on: [ php_script ] \ No newline at end of file + depends_on: [ php_script ] + +#database container +- name: deploy-php-database + image: hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest + environment: + IMAGENAME: innodb + CONTAINERNAME: location_php_database + COMMAND: create + PRIVATE: true + CODEFIRST_CLIENTDRONE_ENV_INNONDB_HOST: + from_secret: db_host + CODEFIRST_CLIENTDRONE_ENV_INNODB_DATABASE: + from_secret: db_database + CODEFIRST_CLIENTDRONE_ENV_INNODB_USER: + from_secret: db_user + CODEFIRST_CLIENTDRONE_ENV_INNODB_PASSWORD: + from_secret: db_password \ No newline at end of file diff --git a/.idea/dafl_music.iml b/.idea/dafl_music.iml index 9f5b22b..7d01c35 100644 --- a/.idea/dafl_music.iml +++ b/.idea/dafl_music.iml @@ -1,5 +1,10 @@ + + + + + @@ -7,7 +12,9 @@ - + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..97a38d7 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/Sources/php_script/script/config.php b/Sources/php_script/script/config.php index 63484ca..68a9e2b 100644 --- a/Sources/php_script/script/config.php +++ b/Sources/php_script/script/config.php @@ -1,8 +1,8 @@ meters($lat1, $lng1, $lat2, $lng2); + $dist = meters($lat1, $lng1, $lat2, $lng2); if ($dist <= 100) { $listUser[] = ['user' => $userID, 'music' => $idMusic]; } } diff --git a/Sources/php_script/script/index.php b/Sources/php_script/script/index.php deleted file mode 100644 index 53b1ece..0000000 --- a/Sources/php_script/script/index.php +++ /dev/null @@ -1,5 +0,0 @@ - \ No newline at end of file