Skip to content

Commit dc5e522

Browse files
authored
fix: demo doesn't build correctly with docker (#1692)
1 parent 97a0073 commit dc5e522

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ DEMO_PACKAGES_CORE_PATH=packages/core
6262
DEMO_PACKAGES_REACT_PATH=packages/react
6363
DEMO_PACKAGES_WEB_SDK_PATH=packages/web-sdk
6464
DEMO_PACKAGES_WEB_TRACING_PATH=packages/web-tracing
65+
DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH=experimental/transport-otlp-http
6566
DEMO_PORT=5173
6667
DEMO_PORT_HMR=24678
6768
DEMO_SERVER_AGENT_HOST=

Dockerfile

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ ARG DEMO_PACKAGES_WEB_TRACING_PATH
99
ARG DEMO_PORT
1010
ARG DEMO_PORT_HMR
1111
ARG DEMO_WORKSPACE_PATH
12+
ARG DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH
1213

1314
# Install Python in order to be able to build the native modules
1415

@@ -39,8 +40,12 @@ COPY .env \
3940
tsconfig.base.esm.json \
4041
tsconfig.base.spec.json \
4142
yarn.lock \
43+
.yarnrc.yml \
4244
./
4345

46+
# Copy .yarn directory with patches and releases
47+
COPY .yarn .yarn
48+
4449
# Demo
4550
COPY ${DEMO_DEMO_PATH}/package.json \
4651
${DEMO_DEMO_PATH}/index.html \
@@ -107,12 +112,27 @@ RUN mkdir ${DEMO_PACKAGES_WEB_TRACING_PATH}/src
107112
RUN cp index.ts ${DEMO_PACKAGES_WEB_TRACING_PATH}/src
108113

109114

115+
# Experimental - Transport OTLP HTTP
116+
COPY ${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/package.json \
117+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/rollup.config.js \
118+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/tsconfig.bundle.json \
119+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/tsconfig.cjs.json \
120+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/tsconfig.esm.json \
121+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/tsconfig.spec.json \
122+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/tsconfig.json \
123+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/
124+
125+
RUN mkdir -p ${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/src
126+
RUN cp index.ts ${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/src
127+
128+
129+
110130
RUN rm index.ts
111131

112132
# Install external dependencies
113133
# In order to save some time, we install the external dependencies first
114134
# And later we rebuild everything
115-
RUN SKIP_GEN_VERSION=1 yarn install --pure-lockfile
135+
RUN SKIP_GEN_VERSION=1 yarn install --immutable
116136

117137
# Add the rest of the files necessary for internal dependencies
118138
# Demo
@@ -123,6 +143,10 @@ COPY ${DEMO_DEMO_PATH} \
123143
COPY ${DEMO_PACKAGES_PATH}/ \
124144
${DEMO_PACKAGES_PATH}/
125145

146+
# Experimental
147+
COPY ${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH} \
148+
${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}/
149+
126150
# Build the packages
127151
RUN yarn clean
128152
RUN yarn build

docker-compose.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ services:
117117
DEMO_PACKAGES_REACT_PATH: '${DEMO_PACKAGES_REACT_PATH}'
118118
DEMO_PACKAGES_WEB_SDK_PATH: '${DEMO_PACKAGES_WEB_SDK_PATH}'
119119
DEMO_PACKAGES_WEB_TRACING_PATH: '${DEMO_PACKAGES_WEB_TRACING_PATH}'
120+
DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH: '${DEMO_EXPERIMENTAL_TRANSPORT_OTLP_HTTP_PATH}'
120121
DEMO_PORT: '${DEMO_PORT}'
121122
DEMO_PORT_HMR: '${DEMO_PORT_HMR}'
122123
ports:

0 commit comments

Comments
 (0)