diff --git a/docker-compose.yml b/docker-compose.yml index fdc4bd1a..88c44c10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,7 +67,16 @@ services: - "8016:8016" networks: - app + healthcheck: + test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/8014 && echo -e 'GET /readyz HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n' >&3 && grep -q 'HTTP/1.1 200' <&3"] + interval: 10s + timeout: 5s + retries: 3 + start_period: 10s pipeline-app: + build: + context: . + dockerfile: pipeline/Dockerfile image: pipeline-app container_name: pipeline-app environment: @@ -92,4 +101,22 @@ services: auth-service: condition: service_healthy flagd: + condition: service_healthy + pipeline-ui: + build: + context: ./pipeline-ui + dockerfile: Dockerfile + args: + VITE_API_BASE_URL: http://pipeline-app:8080/api/v1 + VITE_IDP: keycloak + VITE_KC_URL: http://auth-service:8080 + VITE_KC_REALM: SpringBootRealm + VITE_KC_CLIENTID: pipeline-app + image: pipeline-ui + ports: + - "3000:3000" + networks: + - app + depends_on: + pipeline-app: condition: service_started \ No newline at end of file diff --git a/pipeline-ui/.dockerignore b/pipeline-ui/.dockerignore new file mode 100644 index 00000000..b1ef71cb --- /dev/null +++ b/pipeline-ui/.dockerignore @@ -0,0 +1,11 @@ +node_modules/ +dist/ +coverage/ +.env.* +test/ +*.md +.git +BUILD.bazel +run_tests.sh +.idea +.vscode diff --git a/pipeline-ui/.env.local b/pipeline-ui/.env.local new file mode 100644 index 00000000..c75efeaf --- /dev/null +++ b/pipeline-ui/.env.local @@ -0,0 +1,5 @@ +VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 +VITE_IDP=keycloak +VITE_KC_URL=http://auth-service:8080 +VITE_KC_REALM=SpringBootRealm +VITE_KC_CLIENTID=pipeline-app diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile new file mode 100644 index 00000000..f57f9fd3 --- /dev/null +++ b/pipeline-ui/Dockerfile @@ -0,0 +1,34 @@ +# +# Build stage +# +FROM node:22-alpine AS build +WORKDIR /app +COPY package*.json ./ +RUN npm ci +COPY src ./src +COPY public ./public +COPY index.html . +COPY vite.config.ts . +COPY tsconfig*.json ./ +COPY tailwind.config.js postcss.config.js ./ +ARG VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 +ARG VITE_IDP=keycloak +ARG VITE_KC_URL=http://auth-service:8080 +ARG VITE_KC_REALM=SpringBootRealm +ARG VITE_KC_CLIENTID=pipeline-app +ENV VITE_API_BASE_URL=${VITE_API_BASE_URL} +ENV VITE_IDP=${VITE_IDP} +ENV VITE_KC_URL=${VITE_KC_URL} +ENV VITE_KC_REALM=${VITE_KC_REALM} +ENV VITE_KC_CLIENTID=${VITE_KC_CLIENTID} +RUN npm run build + +# +# Serve stage +# +FROM node:22-alpine +RUN npm install -g serve +WORKDIR /app +COPY --from=build /app/dist ./dist +EXPOSE 3000 +CMD ["serve", "-s", "dist", "-l", "3000"] diff --git a/pipeline-ui/tsconfig.app.json b/pipeline-ui/tsconfig.app.json index f4bd2a0b..10570b49 100644 --- a/pipeline-ui/tsconfig.app.json +++ b/pipeline-ui/tsconfig.app.json @@ -20,6 +20,7 @@ "strict": true, "noUnusedLocals": true, "noUnusedParameters": true, + "erasableSyntaxOnly": true, "noFallthroughCasesInSwitch": true, "noUncheckedSideEffectImports": true }, diff --git a/pipeline/.dockerignore b/pipeline/.dockerignore new file mode 100644 index 00000000..2cf39eb1 --- /dev/null +++ b/pipeline/.dockerignore @@ -0,0 +1,11 @@ +target/ +*.md +.git +BUILD.bazel +run_tests.sh +run_generate_openapi.sh +mvnw +mvnw.cmd +checkstyle.xml +.idea +.vscode diff --git a/Dockerfile b/pipeline/Dockerfile similarity index 82% rename from Dockerfile rename to pipeline/Dockerfile index 969363a9..d53c01f7 100644 --- a/Dockerfile +++ b/pipeline/Dockerfile @@ -14,6 +14,6 @@ RUN mvn clean package -DskipTests -Pmonitoring FROM eclipse-temurin:17-jdk-jammy WORKDIR /app COPY --from=build /home/app/target/pipeline*.jar app.jar -COPY --from=build /home/app/target/agents/*.jar otel-agent.jar +COPY --from=build /home/app/target/agents/opentelemetry-javaagent.jar otel-agent.jar EXPOSE 8080 -ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java index 58deed36..75a433bd 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java @@ -82,4 +82,4 @@ public void getAllBuildsTest() { verify(mapper, times(2)).entityToDto(any(PipelineBuildEntity.class)); } -} +} \ No newline at end of file