Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
11 changes: 11 additions & 0 deletions pipeline-ui/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
node_modules/
dist/
coverage/
.env.*
test/
*.md
.git
BUILD.bazel
run_tests.sh
.idea
.vscode
5 changes: 5 additions & 0 deletions pipeline-ui/.env.local
Comment thread
Baibhab23 marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
@@ -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
34 changes: 34 additions & 0 deletions pipeline-ui/Dockerfile
Original file line number Diff line number Diff line change
@@ -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"]
1 change: 1 addition & 0 deletions pipeline-ui/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"strict": true,
"noUnusedLocals": true,
"noUnusedParameters": true,
"erasableSyntaxOnly": true,
"noFallthroughCasesInSwitch": true,
"noUncheckedSideEffectImports": true
},
Expand Down
11 changes: 11 additions & 0 deletions pipeline/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
target/
*.md
.git
BUILD.bazel
run_tests.sh
run_generate_openapi.sh
mvnw
mvnw.cmd
checkstyle.xml
.idea
.vscode
4 changes: 2 additions & 2 deletions Dockerfile → pipeline/Dockerfile
Comment thread
Baibhab23 marked this conversation as resolved.
Resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"]
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,4 @@ public void getAllBuildsTest() {

verify(mapper, times(2)).entityToDto(any(PipelineBuildEntity.class));
}
}
}
Loading