Skip to content

Commit 38dae66

Browse files
committed
Build all commands
1 parent 8a23f22 commit 38dae66

File tree

4 files changed

+15
-26
lines changed

4 files changed

+15
-26
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22
parameters:
33
cmds:
44
type: string
5-
default: "ssl-auto-recorder ssl-log-player"
5+
default: "ssl-auto-recorder ssl-log-converter ssl-log-cutter ssl-log-indexer ssl-log-player ssl-log-recorder ssl-log-stats ssl-vision-tracker-client"
66

77
jobs:
88
test_go:
@@ -67,7 +67,7 @@ jobs:
6767
version: 20.10.18
6868
- run: |
6969
for cmd in << pipeline.parameters.cmds >>; do
70-
docker build -f ./cmd/${cmd}/Dockerfile -t robocupssl/${cmd}:latest .
70+
docker build --build-arg cmd=${cmd} -t robocupssl/${cmd}:latest .
7171
done
7272
7373
publish_docker:
@@ -83,7 +83,7 @@ jobs:
8383
TAG=${CIRCLE_TAG:1}
8484
TAG=${TAG:-latest}
8585
for cmd in << pipeline.parameters.cmds >>; do
86-
docker build -f ./cmd/${cmd}/Dockerfile -t robocupssl/${cmd}:${TAG} .
86+
docker build --build-arg cmd=${cmd} -t robocupssl/${cmd}:${TAG} .
8787
docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"
8888
docker push robocupssl/${cmd}:${TAG}
8989
done
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
FROM golang:1.20-alpine AS build_go
2+
ARG cmd
23
WORKDIR work
34
COPY . .
4-
RUN go install ./cmd/ssl-log-player
5+
RUN go install ./cmd/${cmd}
56

67
# Start fresh from a smaller image
78
FROM alpine:3
8-
COPY --from=build_go /go/bin/ssl-log-player /app/ssl-log-player
9+
ARG cmd
10+
COPY --from=build_go /go/bin/${cmd} /app/${cmd}
911
WORKDIR /data
1012
RUN chown 1000: /data
1113
USER 1000
12-
ENTRYPOINT ["/app/ssl-log-player"]
14+
ENV COMMAND="/app/${cmd}"
15+
ENTRYPOINT "${COMMAND}"
1316
CMD []

Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
.PHONY: all docker docker-ssl-auto-recorder docker-ssl-log-player test install proto
1+
CMDS = ssl-auto-recorder ssl-log-converter ssl-log-cutter ssl-log-indexer ssl-log-player ssl-log-recorder ssl-log-stats ssl-vision-tracker-client
2+
DOCKER_TARGETS = $(addprefix docker-, $(CMDS))
3+
.PHONY: all docker test install proto $(DOCKER_TARGETS)
24

35
all: install docker
46

5-
docker: docker-ssl-auto-recorder docker-ssl-log-player
7+
docker: $(DOCKER_TARGETS)
68

7-
docker-ssl-auto-recorder:
8-
docker build -f ./cmd/ssl-auto-recorder/Dockerfile -t ssl-auto-recorder:latest .
9-
10-
docker-ssl-log-player:
11-
docker build -f ./cmd/ssl-log-player/Dockerfile -t ssl-log-player:latest .
9+
$(DOCKER_TARGETS): docker-%:
10+
docker build --build-arg cmd=$* -t $*:latest .
1211

1312
test:
1413
go test ./...

cmd/ssl-auto-recorder/Dockerfile

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

0 commit comments

Comments
 (0)