From 88b27e5f39e17e29b7f7b0a84df9212e7308d52f Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 11 Feb 2025 22:23:55 +0100 Subject: [PATCH] [FIX] deploy --- Dockerfile | 10 +++++++--- front/src/components/popup/GenderEditPopUp.tsx | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6e8378..37be7d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ FROM archlinux:base-devel AS common # update system RUN pacman -Syu --noconfirm && pacman-db-upgrade \ - && pacman -S --noconfirm jdk-openjdk \ + && pacman -S --noconfirm jdk-openjdk wget\ && pacman -Scc --noconfirm WORKDIR /tmp @@ -53,13 +53,13 @@ RUN pnpm install --prod=false FROM dependency_front AS load_sources_front # JUST to get the vertion of the application and his sha... -COPY front/build.js \ - front/version.txt \ +COPY \ front/tsconfig.json \ front/tsconfig.node.json \ front/vite.config.mts \ front/index.html \ ./ + COPY front/public ./public COPY front/src ./src @@ -103,4 +103,8 @@ WORKDIR /application/ EXPOSE 80 +# To verify health-check: docker inspect --format "{{json .State.Health }}" YOUR_SERVICE_NAME | jq +HEALTHCHECK --start-period=10s --start-interval=2s --interval=30s --timeout=5s --retries=10 \ + CMD wget --no-verbose --tries=1 --spider http://localhost:80/api/health_check || exit 1 + CMD ["java", "-Xms64M", "-Xmx1G", "-cp", "/application/application.jar", "org.kar.karusic.WebLauncher"] diff --git a/front/src/components/popup/GenderEditPopUp.tsx b/front/src/components/popup/GenderEditPopUp.tsx index 7ece2fa..63360e1 100644 --- a/front/src/components/popup/GenderEditPopUp.tsx +++ b/front/src/components/popup/GenderEditPopUp.tsx @@ -26,6 +26,7 @@ import { useServiceContext } from '@/service/ServiceContext'; import { useCountTracksOfAGender } from '@/service/Track'; import { isNullOrUndefined } from '@/utils/validator'; +import { FormGroupShow } from '../form/FormGroup'; import { Formidable, useFormidable } from '../formidable'; export type GenderEditPopUpProps = {};