From 3a32b39f3d3a22bdc2f1102d7d4b17aaf00a0860 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 21 Mar 2025 10:23:34 +0100 Subject: [PATCH] feat: finalize jakarta-jsp devcontainer setup --- .../jakarta-jsp-todo/.devcontainer/Dockerfile | 2 +- .../.devcontainer/docker-compose.yml | 4 ++ .../{ => .devcontainer}/init.sql | 0 cmd/jws/projects/jakarta-jsp-todo/Dockerfile | 62 ------------------- .../jakarta-jsp-todo/docker-compose.yml | 50 --------------- .../java/com/todoapp/util/HibernateUtil.java | 2 +- .../main/resources/META-INF/persistence.xml | 2 +- 7 files changed, 7 insertions(+), 115 deletions(-) rename cmd/jws/projects/jakarta-jsp-todo/{ => .devcontainer}/init.sql (100%) delete mode 100644 cmd/jws/projects/jakarta-jsp-todo/Dockerfile delete mode 100644 cmd/jws/projects/jakarta-jsp-todo/docker-compose.yml diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile index 4d6ed57..e9d615d 100644 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile +++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/Dockerfile @@ -7,6 +7,6 @@ RUN mkdir -p /config/lib && \ RUN features.sh -COPY --chown=1001:0 target/*.war /config/apps +#COPY --chown=1001:0 target/*.war /config/apps RUN configure.sh diff --git a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml index 854a26c..3141d45 100644 --- a/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml +++ b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/docker-compose.yml @@ -6,6 +6,7 @@ services: dockerfile: .devcontainer/Dockerfile.dev volumes: - ../..:/workspaces:cached + - ./app:/app environment: POSTGRES_HOST: postgresdb POSTGRES_PORT: 5432 @@ -30,6 +31,8 @@ services: POSTGRES_DB: todo_db POSTGRES_USER: postgres POSTGRES_PASSWORD: postgres + volumes: + - ./app:/config/dropins depends_on: - db networks: @@ -41,6 +44,7 @@ services: restart: unless-stopped volumes: - postgres-data:/var/lib/postgresql/data + - ./init.sql:/docker-entrypoint-initdb.d/init.sql environment: POSTGRES_PASSWORD: postgres POSTGRES_USER: postgres diff --git a/cmd/jws/projects/jakarta-jsp-todo/init.sql b/cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql similarity index 100% rename from cmd/jws/projects/jakarta-jsp-todo/init.sql rename to cmd/jws/projects/jakarta-jsp-todo/.devcontainer/init.sql diff --git a/cmd/jws/projects/jakarta-jsp-todo/Dockerfile b/cmd/jws/projects/jakarta-jsp-todo/Dockerfile deleted file mode 100644 index 8889dbd..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -# # Dockerfile für OpenLiberty -# FROM icr.io/appcafe/open-liberty:23.0.0.4-kernel-slim-java17-openj9-ubi -# COPY --chown=1001:0 /src/main/liberty/config /config -# -# # PostgreSQL JDBC-Treiber laden -# # RUN mkdir -p ./lib && \ -# # curl -o ./lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar -# -# RUN curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar -# -# RUN features.sh -# -# COPY --chown=1001:0 target/*.war /config/apps -# -# RUN configure.sh -# -# # # Arbeitsverzeichnis setzen -# # WORKDIR /opt/ol/wlp/usr/servers/defaultServer -# # -# # # Notwendige Dateien kopieren -# # COPY target/todo-app.war ./apps/ -# # # COPY server.xml ./ -# # -# # # PostgreSQL JDBC-Treiber laden -# # RUN mkdir -p ./lib && \ -# # curl -o ./lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar -# # -# # # OpenLiberty starten -# # CMD ["/opt/ol/wlp/bin/server", "run", "defaultServer"] - -# FROM icr.io/appcafe/open-liberty:23.0.0.4-kernel-slim-java17-openj9-ubi -# -# # COPY --chown=1001:0 /src/main/liberty/config /config -# # -# # COPY --chown=1001:0 /src/main/liberty/config/server.xml /opt/ol/wlp/usr/servers/defaultServer/ -# -# RUN chmod 644 /opt/ol/wlp/usr/servers/defaultServer/server.xml -# -# -# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen -# RUN mkdir -p /config/lib && \ -# curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar -# -# RUN features.sh -# -# COPY --chown=1001:0 target/*.war /config/apps -# -# RUN configure.sh - -FROM icr.io/appcafe/open-liberty:23.0.0.4-kernel-slim-java17-openj9-ubi - -COPY --chown=1001:0 /src/main/liberty/config /config -# # Verzeichnis erstellen und PostgreSQL JDBC-Treiber herunterladen -RUN mkdir -p /config/lib && \ - curl -o /config/lib/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.6.0.jar - -RUN features.sh - -COPY --chown=1001:0 target/*.war /config/apps - -RUN configure.sh - diff --git a/cmd/jws/projects/jakarta-jsp-todo/docker-compose.yml b/cmd/jws/projects/jakarta-jsp-todo/docker-compose.yml deleted file mode 100644 index df9af86..0000000 --- a/cmd/jws/projects/jakarta-jsp-todo/docker-compose.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: "3.8" - -services: - postgres: - image: postgres:15 - networks: - - my_network - container_name: postgres_db - restart: always - environment: - POSTGRES_DB: todo_db - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - ports: - - "5432:5432" - volumes: - - postgres_data:/var/lib/postgresql/data - - ./init.sql:/docker-entrypoint-initdb.d/init.sql - healthcheck: - test: ["CMD-SHELL", "pg_isready -U postgres"] - interval: 5s - timeout: 5s - retries: 10 - - openliberty: - build: . - container_name: openliberty_app - networks: - - my_network - restart: always - ports: - - "9080:9080" - - "9443:9443" - depends_on: - - postgres - environment: - - POSTGRES_HOST=postgres - - POSTGRES_PORT=5432 - - POSTGRES_DB=todo_db - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - volumes: - - ./src/main/liberty/config/server.xml:/config/server.xml - # - ./src/main/liberty/config/server.xml:/opt/ol/wlp/usr/servers/defaultServer/server.xml - -volumes: - postgres_data: -networks: - my_network: - driver: bridge diff --git a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java index 2e5f645..e868bc6 100644 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java +++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/java/com/todoapp/util/HibernateUtil.java @@ -61,7 +61,7 @@ public class HibernateUtil { try { Configuration configuration = new Configuration(); configuration.setProperty("hibernate.connection.driver_class", "org.postgresql.Driver"); - configuration.setProperty("hibernate.connection.url", "jdbc:postgresql://postgres:5432/todo_db"); + configuration.setProperty("hibernate.connection.url", "jdbc:postgresql://postgresdb:5432/todo_db"); configuration.setProperty("hibernate.connection.username", "postgres"); configuration.setProperty("hibernate.connection.password", "postgres"); diff --git a/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml b/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml index c69c584..1e6b316 100644 --- a/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml +++ b/cmd/jws/projects/jakarta-jsp-todo/src/main/resources/META-INF/persistence.xml @@ -9,7 +9,7 @@ com.todoapp.model.Todo - +