Skip to content

Commit

Permalink
updated Lockfile
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelperel committed May 26, 2021
1 parent fcbde8d commit ffcaa2e
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 15 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang@sha256:04b95d37ab61bd05b6f163383dbd54da4553be2b427b8980a72f778be4edec6b AS builder
FROM golang:latest@sha256:6f0b0a314b158ff6caf8f12d7f6f3a966500ec6afb533e986eca7375e2f7560f AS builder
WORKDIR /app
COPY go.mod .
COPY go.sum .
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
version: "3"
services:
jaeger:
image: jaegertracing/all-in-one@sha256:710ddea40c84ce01acdb9fdb4c0a76ac11990e425a666968a3ae360dabc4e15f
image: jaegertracing/all-in-one:latest@sha256:85a10441bd1271fff53d1d80e174567d41ab596c5e82f7034e20996c7b6f20d1
ports:
- "16686:16686"
zipkin:
image: openzipkin/zipkin@sha256:1ae0572be3d26fd9ab3fd2da5e8feaa0ca0078dbc31e2ddfb881b1a56bc332b1
image: openzipkin/zipkin:latest@sha256:1ae0572be3d26fd9ab3fd2da5e8feaa0ca0078dbc31e2ddfb881b1a56bc332b1
ports:
- "9411:9411"
otel-collector:
image: otel/opentelemetry-collector@sha256:6f1c53a611091402f0403b628554621591effc7cf88e94be1f9141be007d11c7
image: otel/opentelemetry-collector:latest@sha256:f6ac448b9de543830af942e1691e75fc082c709754bf9ac690e8c216cbb43a25
command: ["--config=/etc/otel-collector-config.yaml"]
volumes:
- ./otel-collector-config.yaml:/etc/otel-collector-config.yaml
depends_on:
- jaeger
- zipkin
otel-agent:
image: otel/opentelemetry-collector@sha256:6f1c53a611091402f0403b628554621591effc7cf88e94be1f9141be007d11c7
image: otel/opentelemetry-collector:latest@sha256:f6ac448b9de543830af942e1691e75fc082c709754bf9ac690e8c216cbb43a25
command: ["--config=/etc/otel-agent-config.yaml"]
volumes:
- ./otel-agent-config.yaml:/etc/otel-agent-config.yaml
Expand Down Expand Up @@ -63,4 +63,4 @@ services:
- otel-agent
- redis
redis:
image: redis:latest
image: redis:latest@sha256:365eddf64356169aa0cbfbeaf928eb80762de3cc364402e7653532bcec912973
38 changes: 29 additions & 9 deletions docker-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,69 @@
{
"name": "golang",
"tag": "latest",
"digest": "04b95d37ab61bd05b6f163383dbd54da4553be2b427b8980a72f778be4edec6b",
"dockerfile": "src/Dockerfile",
"digest": "6f0b0a314b158ff6caf8f12d7f6f3a966500ec6afb533e986eca7375e2f7560f",
"dockerfile": "Dockerfile",
"service": "client"
},
{
"name": "scratch",
"tag": "",
"digest": "",
"dockerfile": "src/Dockerfile",
"dockerfile": "Dockerfile",
"service": "client"
},
{
"name": "jaegertracing/all-in-one",
"tag": "latest",
"digest": "710ddea40c84ce01acdb9fdb4c0a76ac11990e425a666968a3ae360dabc4e15f",
"digest": "85a10441bd1271fff53d1d80e174567d41ab596c5e82f7034e20996c7b6f20d1",
"service": "jaeger"
},
{
"name": "otel/opentelemetry-collector",
"tag": "latest",
"digest": "6f1c53a611091402f0403b628554621591effc7cf88e94be1f9141be007d11c7",
"digest": "f6ac448b9de543830af942e1691e75fc082c709754bf9ac690e8c216cbb43a25",
"service": "otel-agent"
},
{
"name": "otel/opentelemetry-collector",
"tag": "latest",
"digest": "6f1c53a611091402f0403b628554621591effc7cf88e94be1f9141be007d11c7",
"digest": "f6ac448b9de543830af942e1691e75fc082c709754bf9ac690e8c216cbb43a25",
"service": "otel-collector"
},
{
"name": "redis",
"tag": "latest",
"digest": "365eddf64356169aa0cbfbeaf928eb80762de3cc364402e7653532bcec912973",
"service": "redis"
},
{
"name": "golang",
"tag": "latest",
"digest": "04b95d37ab61bd05b6f163383dbd54da4553be2b427b8980a72f778be4edec6b",
"dockerfile": "src/Dockerfile",
"digest": "6f0b0a314b158ff6caf8f12d7f6f3a966500ec6afb533e986eca7375e2f7560f",
"dockerfile": "Dockerfile",
"service": "server"
},
{
"name": "scratch",
"tag": "",
"digest": "",
"dockerfile": "src/Dockerfile",
"dockerfile": "Dockerfile",
"service": "server"
},
{
"name": "golang",
"tag": "latest",
"digest": "6f0b0a314b158ff6caf8f12d7f6f3a966500ec6afb533e986eca7375e2f7560f",
"dockerfile": "Dockerfile",
"service": "worker"
},
{
"name": "scratch",
"tag": "",
"digest": "",
"dockerfile": "Dockerfile",
"service": "worker"
},
{
"name": "openzipkin/zipkin",
"tag": "latest",
Expand Down

0 comments on commit ffcaa2e

Please sign in to comment.