fix(fullstack): Move legalconsenthub.yml API to root

This commit is contained in:
2025-11-15 10:30:00 +01:00
parent af434ad3a4
commit af4dc3b7d8
7 changed files with 26 additions and 13 deletions

View File

@@ -5,12 +5,14 @@ on:
pull_request: pull_request:
paths: paths:
- 'legalconsenthub-backend/**' - 'legalconsenthub-backend/**'
- 'api/**'
- '.gitea/workflows/backend.yaml' - '.gitea/workflows/backend.yaml'
push: push:
branches: branches:
- main - main
paths: paths:
- 'legalconsenthub-backend/**' - 'legalconsenthub-backend/**'
- 'api/**'
- '.gitea/workflows/backend.yaml' - '.gitea/workflows/backend.yaml'
jobs: jobs:
@@ -95,7 +97,8 @@ jobs:
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: ./legalconsenthub-backend context: .
file: ./legalconsenthub-backend/Dockerfile
push: ${{ gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' }} push: ${{ gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

View File

@@ -5,12 +5,14 @@ on:
pull_request: pull_request:
paths: paths:
- 'legalconsenthub/**' - 'legalconsenthub/**'
- 'api/**'
- '.gitea/workflows/frontend.yaml' - '.gitea/workflows/frontend.yaml'
push: push:
branches: branches:
- main - main
paths: paths:
- 'legalconsenthub/**' - 'legalconsenthub/**'
- 'api/**'
- '.gitea/workflows/frontend.yaml' - '.gitea/workflows/frontend.yaml'
jobs: jobs:
@@ -89,7 +91,8 @@ jobs:
- name: Build and push Docker image - name: Build and push Docker image
uses: docker/build-push-action@v5 uses: docker/build-push-action@v5
with: with:
context: ./legalconsenthub context: .
file: ./legalconsenthub/Dockerfile
push: ${{ gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' }} push: ${{ gitea.event_name == 'push' && gitea.ref == 'refs/heads/main' }}
tags: ${{ steps.meta.outputs.tags }} tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}

View File

@@ -2,17 +2,20 @@ FROM eclipse-temurin:21-jdk-alpine AS builder
WORKDIR /workspace/app WORKDIR /workspace/app
COPY gradlew . RUN mkdir -p ../api
COPY gradle gradle
COPY build.gradle . COPY api/legalconsenthub.yml ../api/
COPY settings.gradle .
COPY api api COPY legalconsenthub-backend/gradlew .
COPY legalconsenthub-backend/gradle gradle
COPY legalconsenthub-backend/build.gradle .
COPY legalconsenthub-backend/settings.gradle .
RUN chmod +x ./gradlew RUN chmod +x ./gradlew
RUN ./gradlew dependencies --no-daemon RUN ./gradlew dependencies --no-daemon
COPY src src COPY legalconsenthub-backend/src src
RUN ./gradlew bootJar -x test --no-daemon RUN ./gradlew bootJar -x test --no-daemon

View File

@@ -88,7 +88,7 @@ tasks.named('test') {
task generate_legalconsenthub_server(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) { task generate_legalconsenthub_server(type: org.openapitools.generator.gradle.plugin.tasks.GenerateTask) {
generatorName = 'kotlin-spring' generatorName = 'kotlin-spring'
inputSpec = "$rootDir/api/legalconsenthub.yml".toString() inputSpec = "$rootDir/../api/legalconsenthub.yml".toString()
outputDir = generatedSourcesServerLegalconsenthubDir outputDir = generatedSourcesServerLegalconsenthubDir
apiPackage = 'com.betriebsratkanzlei.legalconsenthub_api.api' apiPackage = 'com.betriebsratkanzlei.legalconsenthub_api.api'
modelPackage = 'com.betriebsratkanzlei.legalconsenthub_api.model' modelPackage = 'com.betriebsratkanzlei.legalconsenthub_api.model'

View File

@@ -6,11 +6,15 @@ RUN apk add --no-cache openjdk21-jre
RUN npm install -g pnpm@10.13.1 RUN npm install -g pnpm@10.13.1
COPY package.json pnpm-lock.yaml ./ RUN mkdir -p ../api
COPY api/legalconsenthub.yml ../api/
COPY legalconsenthub/package.json legalconsenthub/pnpm-lock.yaml ./
RUN pnpm install --frozen-lockfile RUN pnpm install --frozen-lockfile
COPY . . COPY legalconsenthub/ .
RUN pnpm build RUN pnpm build

View File

@@ -12,8 +12,8 @@
"type-check": "nuxi typecheck", "type-check": "nuxi typecheck",
"lint": "eslint .", "lint": "eslint .",
"lint:fix": "eslint . --fix", "lint:fix": "eslint . --fix",
"api:generate": "openapi-generator-cli generate -i ../legalconsenthub-backend/api/legalconsenthub.yml -g typescript-fetch -o .api-client", "api:generate": "openapi-generator-cli generate -i ../api/legalconsenthub.yml -g typescript-fetch -o .api-client",
"api:middleware:generate": "openapi-generator-cli generate -i ../legalconsenthub-middleware/api/legalconsenthub-middleware.yml -g typescript-fetch -o .api-client-middleware" "api:middleware:generate": "openapi-generator-cli generate -i ../api/legalconsenthub-middleware.yml -g typescript-fetch -o .api-client-middleware"
}, },
"dependencies": { "dependencies": {
"@nuxt/ui": "^4.1.0", "@nuxt/ui": "^4.1.0",