From f435bdcd5a4f14801f0fcc62ffe466ea079f4904 Mon Sep 17 00:00:00 2001 From: Ionel Andrei Cataon Date: Wed, 18 Feb 2026 15:44:19 +0200 Subject: [PATCH] s --- proiect-nutritie-java/Dockerfile | 17 +++++------------ proiect-nutritie-java/pom.xml | 10 ++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/proiect-nutritie-java/Dockerfile b/proiect-nutritie-java/Dockerfile index 32729d4..cfd6420 100644 --- a/proiect-nutritie-java/Dockerfile +++ b/proiect-nutritie-java/Dockerfile @@ -1,16 +1,9 @@ -# Docker va descărca singur Python și Pip în interiorul imaginii -FROM python:3.9-slim +FROM tomcat:9.0-jdk11-openjdk-slim -WORKDIR /app +RUN rm -rf /usr/local/tomcat/webapps/* -# Copiem fișierul de dependințe -COPY requirements.txt . +COPY target/nutritie.war /usr/local/tomcat/webapps/ROOT.war -# Aici Docker va rula 'pip install' în interiorul lui, nu pe Ubuntu al tău -RUN pip install --no-cache-dir -r requirements.txt +EXPOSE 8080 -COPY . . - -EXPOSE 5000 - -CMD ["python", "app/main.py"] \ No newline at end of file +CMD ["catalina.sh", "run"] \ No newline at end of file diff --git a/proiect-nutritie-java/pom.xml b/proiect-nutritie-java/pom.xml index 7ccb32b..8ed13cd 100644 --- a/proiect-nutritie-java/pom.xml +++ b/proiect-nutritie-java/pom.xml @@ -9,5 +9,15 @@ nutritie + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + false + + + \ No newline at end of file