Replaced Material data with dummy data & restored dockerfile
because flyway does not execute successfully with the contained duplicates etc.
This commit is contained in:
parent
f982bc4629
commit
2b83bfe956
3 changed files with 13 additions and 49 deletions
46
dockerfile
46
dockerfile
|
|
@ -1,56 +1,20 @@
|
||||||
# Frontend Build Stage
|
|
||||||
FROM node:20-alpine AS frontend-build
|
FROM node:20-alpine AS frontend-build
|
||||||
WORKDIR /app/frontend
|
WORKDIR /app/frontend
|
||||||
|
|
||||||
# Nur package files zuerst kopieren für besseres Caching
|
|
||||||
COPY src/frontend/package*.json ./
|
COPY src/frontend/package*.json ./
|
||||||
RUN npm ci --only=production
|
RUN npm ci
|
||||||
|
|
||||||
# Frontend Source Code kopieren
|
|
||||||
COPY src/frontend/ ./
|
COPY src/frontend/ ./
|
||||||
|
|
||||||
# Frontend bauen
|
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
|
||||||
# Backend Build Stage
|
|
||||||
FROM maven:3.9-eclipse-temurin-23 AS backend-build
|
FROM maven:3.9-eclipse-temurin-23 AS backend-build
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
# Nur pom.xml zuerst für besseres Dependency Caching
|
|
||||||
COPY pom.xml ./
|
COPY pom.xml ./
|
||||||
RUN mvn dependency:go-offline -B
|
|
||||||
|
|
||||||
# Backend Source Code kopieren (ohne frontend)
|
|
||||||
COPY src ./src
|
COPY src ./src
|
||||||
|
# copy frontend
|
||||||
# Frontend Build Results kopieren
|
|
||||||
COPY --from=frontend-build /app/frontend/dist ./src/main/resources/static
|
COPY --from=frontend-build /app/frontend/dist ./src/main/resources/static
|
||||||
|
RUN mvn clean package -DskipTests
|
||||||
|
|
||||||
# Build mit optimierten Maven Settings
|
|
||||||
RUN mvn clean package -DskipTests -B -T 1C
|
|
||||||
|
|
||||||
# Runtime Stage - Optimiert
|
|
||||||
FROM eclipse-temurin:23-jre-alpine
|
FROM eclipse-temurin:23-jre-alpine
|
||||||
|
|
||||||
# Sicherheit: Non-root User
|
|
||||||
RUN addgroup -g 1001 -S appgroup && \
|
|
||||||
adduser -u 1001 -S appuser -G appgroup
|
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
COPY --from=backend-build /app/target/*.jar app.jar
|
||||||
# App kopieren
|
|
||||||
COPY --from=backend-build --chown=appuser:appgroup /app/target/*.jar app.jar
|
|
||||||
|
|
||||||
# Wechsel zu non-root user
|
|
||||||
USER appuser
|
|
||||||
|
|
||||||
# Health check hinzufügen (optional, passe den Pfad an)
|
|
||||||
HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
|
|
||||||
CMD wget --no-verbose --tries=1 --spider http://localhost:8080/actuator/health || exit 1
|
|
||||||
|
|
||||||
EXPOSE 8080
|
EXPOSE 8080
|
||||||
|
ENTRYPOINT ["java", "-jar", "app.jar"]
|
||||||
# JVM Memory Optimierungen
|
|
||||||
ENV JAVA_OPTS="-XX:+UseContainerSupport -XX:MaxRAMPercentage=75.0 -XX:+ExitOnOutOfMemoryError"
|
|
||||||
|
|
||||||
ENTRYPOINT ["sh", "-c", "java $JAVA_OPTS -jar app.jar"]
|
|
||||||
|
|
@ -65,9 +65,9 @@ VALUES
|
||||||
('Stackable', 'STACKABLE', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 1),
|
('Stackable', 'STACKABLE', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 1),
|
||||||
('Rust Prevention', 'RUST_PREVENTION', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 2),
|
('Rust Prevention', 'RUST_PREVENTION', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 2),
|
||||||
('Mixable', 'MIXABLE', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 3)
|
('Mixable', 'MIXABLE', 'BOOLEAN', NULL, FALSE, 'desc', 'general', 3)
|
||||||
ON DUPLICATE KEY UPDATE
|
AS props ON DUPLICATE KEY UPDATE
|
||||||
name = VALUES(name),
|
name = props.name,
|
||||||
data_type = VALUES(data_type);
|
data_type = props.data_type;
|
||||||
|
|
||||||
-- ============================================
|
-- ============================================
|
||||||
-- SHU Packaging Dimensions
|
-- SHU Packaging Dimensions
|
||||||
|
|
|
||||||
|
|
@ -26,23 +26,23 @@ INSERT INTO sys_group(group_name, group_description)
|
||||||
VALUES ('right-management',
|
VALUES ('right-management',
|
||||||
'Add/Remove users, groups, etc.');
|
'Add/Remove users, groups, etc.');
|
||||||
|
|
||||||
INSERT INTO sys_user_group_mapping (user_id, group_id)
|
INSERT INTO sys_user_group_mapping (group_id, user_id)
|
||||||
VALUES ((SELECT id FROM sys_group WHERE group_name = 'super'),
|
VALUES ((SELECT id FROM sys_group WHERE group_name = 'super'),
|
||||||
(SELECT id FROM sys_user WHERE email = 'john.doe@company.com'));
|
(SELECT id FROM sys_user WHERE email = 'john.doe@company.com'));
|
||||||
|
|
||||||
INSERT INTO sys_user_group_mapping (user_id, group_id)
|
INSERT INTO sys_user_group_mapping (group_id, user_id)
|
||||||
VALUES ((SELECT id FROM sys_group WHERE group_name = 'basic'),
|
VALUES ((SELECT id FROM sys_group WHERE group_name = 'basic'),
|
||||||
(SELECT id FROM sys_user WHERE email = 'sarah.smith@company.com'));
|
(SELECT id FROM sys_user WHERE email = 'sarah.smith@company.com'));
|
||||||
|
|
||||||
INSERT INTO sys_user_group_mapping (user_id, group_id)
|
INSERT INTO sys_user_group_mapping (group_id, user_id)
|
||||||
VALUES ((SELECT id FROM sys_group WHERE group_name = 'calculation'),
|
VALUES ((SELECT id FROM sys_group WHERE group_name = 'calculation'),
|
||||||
(SELECT id FROM sys_user WHERE email = 'mike.johnson@company.com'));
|
(SELECT id FROM sys_user WHERE email = 'mike.johnson@company.com'));
|
||||||
|
|
||||||
INSERT INTO sys_user_group_mapping (user_id, group_id)
|
INSERT INTO sys_user_group_mapping (group_id, user_id)
|
||||||
VALUES ((SELECT id FROM sys_group WHERE group_name = 'freight'),
|
VALUES ((SELECT id FROM sys_group WHERE group_name = 'freight'),
|
||||||
(SELECT id FROM sys_user WHERE email = 'anna.mueller@company.com'));
|
(SELECT id FROM sys_user WHERE email = 'anna.mueller@company.com'));
|
||||||
|
|
||||||
INSERT INTO sys_user_group_mapping (user_id, group_id)
|
INSERT INTO sys_user_group_mapping (group_id, user_id)
|
||||||
VALUES ((SELECT id FROM sys_group WHERE group_name = 'packaging'),
|
VALUES ((SELECT id FROM sys_group WHERE group_name = 'packaging'),
|
||||||
(SELECT id FROM sys_user WHERE email = 'david.chen@company.com'));
|
(SELECT id FROM sys_user WHERE email = 'david.chen@company.com'));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue