@@ -13,8 +13,6 @@ ARG OTEL_COLLECTOR_VERSION=0.126.0
1313ARG OTEL_COLLECTOR_OPAMPSUPERVISOR_VERSION=0.126.0
1414
1515# base #############################################################################################
16- # == Clickhouse/Base Image ==
17- FROM clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}-alpine AS clickhouse_base
1816# == Otel Collector Image ==
1917FROM otel/opentelemetry-collector-contrib:${OTEL_COLLECTOR_VERSION} AS otel_collector_base
2018FROM otel/opentelemetry-collector-opampsupervisor:${OTEL_COLLECTOR_OPAMPSUPERVISOR_VERSION} AS otel_collector_opampsupervisor_base
@@ -51,8 +49,6 @@ ENV NEXT_TELEMETRY_DISABLED 1
5149ENV NEXT_OUTPUT_STANDALONE true
5250ENV NEXT_PUBLIC_IS_LOCAL_MODE false
5351RUN npx nx run-many --target=build --projects=@hyperdx/common-utils,@hyperdx/api,@hyperdx/app
54- RUN rm -rf node_modules && yarn workspaces focus @hyperdx/api --production
55-
5652
5753# prod ############################################################################################
5854FROM node:${NODE_VERSION}-alpine AS prod
@@ -69,10 +65,7 @@ USER node
6965
7066# Set up API and App
7167WORKDIR /app
72- COPY --chown=node:node --from=builder /app/node_modules ./node_modules
73- COPY --chown=node:node --from=builder /app/packages/api/build ./packages/api/build
74- COPY --chown=node:node --from=builder /app/packages/common-utils/dist ./packages/common-utils/dist
75- COPY --chown=node:node --from=node_base /app/packages/common-utils/node_modules ./packages/common-utils/node_modules
68+ COPY --chown=node:node --from=builder /app/packages/api/dist ./packages/api
7669COPY --chown=node:node --from=builder /app/packages/app/.next/standalone ./packages/app
7770COPY --chown=node:node --from=builder /app/packages/app/.next/static ./packages/app/packages/app/.next/static
7871COPY --chown=node:node --from=builder /app/packages/app/public ./packages/app/packages/app/public
@@ -82,13 +75,12 @@ COPY --chown=node:node --from=hyperdx ./entry.prod.sh /etc/local/entry.sh
8275ENTRYPOINT ["sh" , "/etc/local/entry.sh" ]
8376
8477# all-in-one base ############################################################################################
85- FROM scratch AS all-in-one-base
78+ FROM clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}-alpine AS all-in-one-base
8679
8780ARG CODE_VERSION
8881
8982ENV CODE_VERSION=$CODE_VERSION
90- # Copy from clickhouse and otel collector bases
91- COPY --from=clickhouse_base / /
83+ # Copy from otel collector bases
9284COPY --from=otel_collector_base --chmod=755 /otelcol-contrib /otelcontribcol
9385COPY --from=otel_collector_opampsupervisor_base --chmod=755 /usr/local/bin/opampsupervisor /usr/local/bin/opampsupervisor
9486
@@ -98,6 +90,9 @@ COPY --from=node_base --link /usr/local/lib /usr/local/lib
9890COPY --from=node_base /usr/lib /usr/lib
9991COPY --from=node_base /usr/local/include /usr/local/include
10092
93+ # Install libs used for the start script
94+ RUN npm install -g
[email protected] 95+
10196# Set up Clickhouse
10297COPY --from=clickhouse ./local/*.xml /etc/clickhouse-server
10398COPY --from=hyperdx ./clickhouseConfig.xml /etc/clickhouse-server/config.xml
0 commit comments