From a005226c9616fa0c78a664e836c95598545970ce Mon Sep 17 00:00:00 2001 From: Dzejkobik007 Date: Wed, 4 Jan 2023 09:15:07 +0100 Subject: [PATCH] Update --- wap/api-calc/Dockerfile | 3 +++ wap/api-calc/README.md | 17 +++++++++++++++++ wap/api-calc/docker-compose.yml | 20 ++++---------------- wap/api-calc/nginx/Dockerfile | 3 --- wap/api-calc/php/Dockerfile | 2 -- wap/api-calc/src/math-api/utils.php | 8 ++++---- 6 files changed, 28 insertions(+), 25 deletions(-) create mode 100644 wap/api-calc/Dockerfile create mode 100644 wap/api-calc/README.md delete mode 100644 wap/api-calc/nginx/Dockerfile delete mode 100644 wap/api-calc/php/Dockerfile diff --git a/wap/api-calc/Dockerfile b/wap/api-calc/Dockerfile new file mode 100644 index 0000000..754d1fe --- /dev/null +++ b/wap/api-calc/Dockerfile @@ -0,0 +1,3 @@ +FROM php:7.4-alpine +COPY src /var/www/html/ +CMD ["php", "-S", "0.0.0.0:80", "-t", "/var/www/html/"] \ No newline at end of file diff --git a/wap/api-calc/README.md b/wap/api-calc/README.md new file mode 100644 index 0000000..450b662 --- /dev/null +++ b/wap/api-calc/README.md @@ -0,0 +1,17 @@ +# **Calc Api** + +## Popis + +Api pro základní matematické operace + +## Quick start +```bash +git clone https://github.com/Dzejkobik007/skolavdf.git +mv skolavdf/wap/api-calc ./ +rm -rf skolavdf +cd api-calc/ +docker-compose up -d --build +``` +## Requirements +- docker +- docker-compose diff --git a/wap/api-calc/docker-compose.yml b/wap/api-calc/docker-compose.yml index 5ce4131..56efe5d 100644 --- a/wap/api-calc/docker-compose.yml +++ b/wap/api-calc/docker-compose.yml @@ -1,22 +1,10 @@ version: '3' services: - nginx: - build: - context: . - dockerfile: nginx/Dockerfile - restart: always - container_name: api-calcc - ports: - - 80:80 - networks: - - internal php: build: context: . - dockerfile: php/Dockerfile - networks: - - internal -networks: - internal: - driver: bridge \ No newline at end of file + dockerfile: Dockerfile + restart: always + ports: + - 80:80 \ No newline at end of file diff --git a/wap/api-calc/nginx/Dockerfile b/wap/api-calc/nginx/Dockerfile deleted file mode 100644 index 6b897ad..0000000 --- a/wap/api-calc/nginx/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM nginx:1.23.1-alpine -COPY src /var/www/html/ -COPY nginx/default.conf /etc/nginx/conf.d \ No newline at end of file diff --git a/wap/api-calc/php/Dockerfile b/wap/api-calc/php/Dockerfile deleted file mode 100644 index 285998b..0000000 --- a/wap/api-calc/php/Dockerfile +++ /dev/null @@ -1,2 +0,0 @@ -FROM php:fpm-alpine -COPY src /var/www/html/ \ No newline at end of file diff --git a/wap/api-calc/src/math-api/utils.php b/wap/api-calc/src/math-api/utils.php index deea890..0a7a3ca 100644 --- a/wap/api-calc/src/math-api/utils.php +++ b/wap/api-calc/src/math-api/utils.php @@ -42,16 +42,16 @@ function processData(Array $data) { } function addNumbers(Array $num){ - $result = 0; - for ($i = 0; $i < sizeof($num);$i++) { + $result = $num[0]; + for ($i = 1; $i < sizeof($num);$i++) { $result += $num[$i]; } return $result; } function subNumbers(Array $num) { - $result = 0; - for ($i = 0; $i < sizeof($num);$i++) { + $result = $num[0]; + for ($i = 1; $i < sizeof($num);$i++) { $result -= $num[$i]; } return $result;