Skip to content

Commit 322203e

Browse files
committed
Build otel into evmd docker image
1 parent f775d2d commit 322203e

File tree

3 files changed

+17
-14
lines changed

3 files changed

+17
-14
lines changed

conf/worker.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ chains:
5757
dockerfile: "./hack/evm.Dockerfile"
5858
additional_files:
5959
- "./hack/evmd-entrypoint.sh"
60+
- "./hack/otel.yaml"
6061
gid: "1025"
6162
uid: "1025"
6263
binary_name: "/usr/bin/evmd"
@@ -74,4 +75,4 @@ grafana:
7475
name: "comet-performance"
7576
human_name: "CometBFT Performance"
7677

77-
server_address: "localhost:9006"
78+
server_address: "localhost:9006"

hack/evm.Dockerfile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ RUN git clone $CHAIN_SRC /src/app && \
2020

2121
WORKDIR /src/app/evmd
2222
RUN if [ -n "$REPLACE_CMD" ]; then \
23-
go mod tidy && \
24-
echo "After go mod tidy, applying replace commands:" && \
25-
echo "$REPLACE_CMD" > replace_cmd.sh && \
26-
chmod +x replace_cmd.sh && \
27-
sh replace_cmd.sh && \
28-
echo "Final go.mod:" && \
29-
cat go.mod && \
30-
echo "Updating go.sum with replaced modules:" && \
31-
go get ./... && \
32-
echo "Done updating go.sum"; \
33-
else \
34-
go mod tidy; \
35-
fi
23+
go mod tidy && \
24+
echo "After go mod tidy, applying replace commands:" && \
25+
echo "$REPLACE_CMD" > replace_cmd.sh && \
26+
chmod +x replace_cmd.sh && \
27+
sh replace_cmd.sh && \
28+
echo "Final go.mod:" && \
29+
cat go.mod && \
30+
echo "Updating go.sum with replaced modules:" && \
31+
go get ./... && \
32+
echo "Done updating go.sum"; \
33+
else \
34+
go mod tidy; \
35+
fi
3636
WORKDIR /src/app
3737

3838
RUN make build
@@ -44,6 +44,7 @@ RUN addgroup -g 1025 nonroot
4444
RUN adduser -D nonroot -u 1025 -G nonroot
4545
RUN mkdir -p /home/nonroot && chown nonroot:nonroot /home/nonroot
4646
ARG IMG_TAG
47+
COPY otel.yaml /etc/otel.yaml
4748
COPY evmd-entrypoint.sh /usr/bin/entrypoint.sh
4849
RUN chmod +x /usr/bin/entrypoint.sh
4950
COPY --from=evmd-builder /src/app/build/evmd /usr/bin/evmd

petri/contrib/digitalocean/files/otel.yaml renamed to hack/otel.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
file_format: "1.0-rc.3"
12
resource:
23
attributes:
34
- name: service.name

0 commit comments

Comments
 (0)