[examples/demo] fix demo could not stat up (open-telemetry#16169)

* fix demo could not stat up Signed-off-by: Jared Tan <[email protected]> * remove unnecessary GOOS=linux Signed-off-by: Jared Tan <[email protected]> Signed-off-by: Jared Tan <[email protected]>
zdelagrange · Nov 16, 2022 · d9b5dcc · d9b5dcc
1 parent 3c2d780
commit d9b5dcc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/examples/demo/client/Dockerfile b/examples/demo/client/Dockerfile
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 FROM golang:1.18 as build
-COPY . /usr/src/client/
-WORKDIR /usr/src/client/
+WORKDIR /app/
+COPY . .
 RUN go env -w GOPROXY=direct
-RUN go install ./main.go
+RUN CGO_ENABLED=0 go build -o main main.go
 FROM alpine:3.15
-COPY --from=build /go/bin/main /go/bin/main
-CMD ["/go/bin/main"]
+COPY --from=build /app/main /app/main
+CMD ["/app/main"]
diff --git a/examples/demo/docker-compose.yaml b/examples/demo/docker-compose.yaml
@@ -4,6 +4,7 @@ services:
  # Jaeger
  jaeger-all-in-one:
  image: jaegertracing/all-in-one:latest
+ restart: always
  ports:
  - "16686:16686"
  - "14268"
@@ -12,12 +13,14 @@ services:
  # Zipkin
  zipkin-all-in-one:
  image: openzipkin/zipkin:latest
+ restart: always
  ports:
  - "9411:9411"
 
  # Collector
  otel-collector:
  image: ${OTELCOL_IMG}
+ restart: always
  command: ["--config=/etc/otel-collector-config.yaml", "${OTELCOL_ARGS}"]
  volumes:
  - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
@@ -36,6 +39,7 @@ services:
  build:
  dockerfile: Dockerfile
  context: ./client
+ restart: always
  environment:
  - OTEL_EXPORTER_OTLP_ENDPOINT=otel-collector:4317
  - DEMO_SERVER_ENDPOINT=http:https://demo-server:7080/hello
@@ -46,6 +50,7 @@ services:
  build:
  dockerfile: Dockerfile
  context: ./server
+ restart: always
  environment:
  - OTEL_EXPORTER_OTLP_ENDPOINT=otel-collector:4317
  ports:
@@ -56,6 +61,7 @@ services:
  prometheus:
  container_name: prometheus
  image: prom/prometheus:latest
+ restart: always
  volumes:
  - ./prometheus.yaml:/etc/prometheus/prometheus.yml
  ports:

diff --git a/examples/demo/server/Dockerfile b/examples/demo/server/Dockerfile
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 FROM golang:1.18 as build
-COPY . /usr/src/server/
-WORKDIR /usr/src/server/
+WORKDIR /app/
+COPY . .
 RUN go env -w GOPROXY=direct
-RUN go install ./main.go
+RUN CGO_ENABLED=0 go build -o main main.go
 FROM alpine:3.15
-COPY --from=build /go/bin/main /go/bin/main
-CMD ["/go/bin/main"]
+COPY --from=build /app/main /app/main
+CMD ["/app/main"]