Skip to content

Commit

Permalink
Build all commands
Browse files Browse the repository at this point in the history
  • Loading branch information
g3force committed Apr 16, 2023
1 parent 8a23f22 commit 38dae66
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 26 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1
parameters:
cmds:
type: string
default: "ssl-auto-recorder ssl-log-player"
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"

jobs:
test_go:
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
version: 20.10.18
- run: |
for cmd in << pipeline.parameters.cmds >>; do
docker build -f ./cmd/${cmd}/Dockerfile -t robocupssl/${cmd}:latest .
docker build --build-arg cmd=${cmd} -t robocupssl/${cmd}:latest .
done
publish_docker:
Expand All @@ -83,7 +83,7 @@ jobs:
TAG=${CIRCLE_TAG:1}
TAG=${TAG:-latest}
for cmd in << pipeline.parameters.cmds >>; do
docker build -f ./cmd/${cmd}/Dockerfile -t robocupssl/${cmd}:${TAG} .
docker build --build-arg cmd=${cmd} -t robocupssl/${cmd}:${TAG} .
docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"
docker push robocupssl/${cmd}:${TAG}
done
Expand Down
9 changes: 6 additions & 3 deletions cmd/ssl-log-player/Dockerfile → Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
FROM golang:1.20-alpine AS build_go
ARG cmd
WORKDIR work
COPY . .
RUN go install ./cmd/ssl-log-player
RUN go install ./cmd/${cmd}

# Start fresh from a smaller image
FROM alpine:3
COPY --from=build_go /go/bin/ssl-log-player /app/ssl-log-player
ARG cmd
COPY --from=build_go /go/bin/${cmd} /app/${cmd}
WORKDIR /data
RUN chown 1000: /data
USER 1000
ENTRYPOINT ["/app/ssl-log-player"]
ENV COMMAND="/app/${cmd}"
ENTRYPOINT "${COMMAND}"
CMD []
13 changes: 6 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
.PHONY: all docker docker-ssl-auto-recorder docker-ssl-log-player test install proto
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
DOCKER_TARGETS = $(addprefix docker-, $(CMDS))
.PHONY: all docker test install proto $(DOCKER_TARGETS)

all: install docker

docker: docker-ssl-auto-recorder docker-ssl-log-player
docker: $(DOCKER_TARGETS)

docker-ssl-auto-recorder:
docker build -f ./cmd/ssl-auto-recorder/Dockerfile -t ssl-auto-recorder:latest .

docker-ssl-log-player:
docker build -f ./cmd/ssl-log-player/Dockerfile -t ssl-log-player:latest .
$(DOCKER_TARGETS): docker-%:
docker build --build-arg cmd=$* -t $*:latest .

test:
go test ./...
Expand Down
13 changes: 0 additions & 13 deletions cmd/ssl-auto-recorder/Dockerfile

This file was deleted.

0 comments on commit 38dae66

Please sign in to comment.