Skip to content

Commit 5a2d463

Browse files
committed
move to single image
1 parent 114e1ea commit 5a2d463

File tree

7 files changed

+22
-176
lines changed

7 files changed

+22
-176
lines changed

Cargo.lock

Lines changed: 0 additions & 57 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ testcontainers-modules = { version = "0.11.2", features = ["postgres", "kafka",
6161
jsonrpsee = { version = "0.26.0", features = ["server", "macros"] }
6262

6363
# Kafka and S3 dependencies
64-
rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored", "sasl"] }
64+
rdkafka = { version = "0.37.0", features = ["libz-static", "ssl-vendored"] }
6565
aws-config = "1.1.7"
6666
aws-sdk-s3 = "1.106.0"
6767
aws-credential-types = "1.1.7"
Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,19 @@ COPY . .
2121
RUN --mount=type=cache,target=/usr/local/cargo/registry \
2222
--mount=type=cache,target=/usr/local/cargo/git \
2323
--mount=type=cache,target=/app/target \
24-
cargo build --bin tips-ingress-writer && \
25-
cp target/debug/tips-ingress-writer /tmp/tips-ingress-writer
24+
cargo build && \
25+
cp target/debug/tips-maintenance /tmp/tips-maintenance && \
26+
cp target/debug/tips-ingress-rpc /tmp/tips-ingress-rpc && \
27+
cp target/debug/tips-ingress-writer /tmp/tips-ingress-writer && \
28+
cp target/debug/tips-audit /tmp/tips-audit
2629

2730
FROM debian:bookworm
2831

2932
RUN apt-get update && apt-get install -y libssl3 ca-certificates && rm -rf /var/lib/apt/lists/*
3033

3134
WORKDIR /app
3235

33-
COPY --from=builder /tmp/tips-ingress-writer /app/tips-ingress-writer
34-
35-
CMD ["/app/tips-ingress-writer"]
36+
COPY --from=builder /tmp/tips-maintenance /app/tips-maintenance
37+
COPY --from=builder /tmp/tips-audit /app/tips-audit
38+
COPY --from=builder /tmp/tips-ingress-rpc /app/tips-ingress-rpc
39+
COPY --from=builder /tmp/tips-ingress-writer /app/tips-ingress-writer

crates/audit/Dockerfile

Lines changed: 0 additions & 37 deletions
This file was deleted.

crates/ingress-rpc/Dockerfile

Lines changed: 0 additions & 37 deletions
This file was deleted.

crates/maintenance/Dockerfile

Lines changed: 0 additions & 35 deletions
This file was deleted.

docker-compose.tips.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ services:
22
ingress-rpc:
33
build:
44
context: .
5-
dockerfile: crates/ingress-rpc/Dockerfile
5+
dockerfile: Dockerfile
6+
command:
7+
- "/app/tips-ingress-rpc"
68
container_name: tips-ingress-rpc
79
ports:
810
- "8080:8080"
@@ -15,7 +17,9 @@ services:
1517
audit:
1618
build:
1719
context: .
18-
dockerfile: crates/audit/Dockerfile
20+
dockerfile: Dockerfile
21+
command:
22+
- "/app/tips-audit"
1923
container_name: tips-audit
2024
env_file:
2125
- .env.docker
@@ -26,7 +30,9 @@ services:
2630
maintenance:
2731
build:
2832
context: .
29-
dockerfile: crates/maintenance/Dockerfile
33+
dockerfile: Dockerfile
34+
command:
35+
- "/app/tips-maintenance"
3036
container_name: tips-maintenance
3137
env_file:
3238
- .env.docker
@@ -48,7 +54,9 @@ services:
4854
ingress-writer:
4955
build:
5056
context: .
51-
dockerfile: crates/ingress-writer/Dockerfile
57+
dockerfile: Dockerfile
58+
command:
59+
- "/app/tips-ingress-writer"
5260
container_name: tips-ingress-writer
5361
env_file:
5462
- .env.docker

0 commit comments

Comments
 (0)