From af9466f7a8dc8b84e2c4ae93f21a8c92f10c30bb Mon Sep 17 00:00:00 2001 From: Administrator Date: Sun, 27 Apr 2025 11:02:22 +0000 Subject: [PATCH] =?UTF-8?q?#7=20-=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=BD?= =?UTF-8?q?=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=86=D0=B8=D0=B9=20=D0=BA=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + .../java/ru/kayashov/bar/controller/CocktailController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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); }