diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 238304e..c6b12d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ deploy-back-job: - echo "Остановка старого контейнера" - docker stop my-bar - docker rm my-bar + - docker rmi my-bar - echo "Сборка образа докер" - docker build -t my-bar . - echo "Запуск докер контейнера" diff --git a/src/main/java/ru/kayashov/bar/controller/CocktailController.java b/src/main/java/ru/kayashov/bar/controller/CocktailController.java index 7fe35f3..3a63980 100644 --- a/src/main/java/ru/kayashov/bar/controller/CocktailController.java +++ b/src/main/java/ru/kayashov/bar/controller/CocktailController.java @@ -45,7 +45,7 @@ public class CocktailController { } @GetMapping("/instructions") - public String getInstructions(@RequestParam Long id) { + public String getInstructions(@RequestParam("id") Long id) { return cocktailService.findInstructions(id); }