Skip to content

Commit

Permalink
Add armadactl docker image. (#326)
Browse files Browse the repository at this point in the history
* Create docker image for armadactl.

* Fix armadactl docker entrypoint.
  • Loading branch information
jankaspar committed Mar 3, 2020
1 parent cb3b2f1 commit 045ae2f
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 2 deletions.
7 changes: 7 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ jobs:
docker tag armada-executor gresearchdev/armada-executor-dev:${TAG}
docker push gresearchdev/armada-executor-dev:${TAG}
docker tag armadactl gresearchdev/armada-armadactl-dev:${TAG}
docker push gresearchdev/armada-armadactl-dev:${TAG}
docker tag armada-fakeexecutor gresearchdev/armada-fakeexecutor-dev:${TAG}
docker push gresearchdev/armada-fakeexecutor-dev:${TAG}
deploy:
Expand Down Expand Up @@ -175,6 +178,10 @@ jobs:
docker tag gresearchdev/armada-executor-dev:${TAG} gresearchdev/armada-executor:${RELEASE_TAG}
docker push gresearchdev/armada-executor:${RELEASE_TAG}
docker pull gresearchdev/armada-armadactl-dev:${TAG}
docker tag gresearchdev/armada-armadactl-dev:${TAG} gresearchdev/armada-armadactl:${RELEASE_TAG}
docker push gresearchdev/armada-armadactl:${RELEASE_TAG}
release-dotnet-client:
docker:
- image: mcr.microsoft.com/dotnet/core/sdk:3.0.101-alpine3.10
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*.so
*.dylib
bin/
armadactl

# Test binary, built with `go test -c`
*.test
Expand Down
13 changes: 13 additions & 0 deletions build/armadactl/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM alpine:3.10

RUN apk update && apk add --no-cache ca-certificates

RUN addgroup -S -g 2000 armada && adduser -S -u 1000 armada -G armada

USER armada

COPY ./bin/linux/armadactl /app/

WORKDIR /app

ENTRYPOINT ["./armadactl"]
6 changes: 5 additions & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,15 @@ build-docker-executor:
$(gobuildlinux) -o ./bin/linux/executor cmd/executor/main.go
docker build $(dockerFlags) -t armada-executor -f ./build/executor/Dockerfile .

build-docker-armadactl:
$(gobuildlinux) -o ./bin/linux/armadactl cmd/armadactl/main.go
docker build $(dockerFlags) -t armadactl -f ./build/armadactl/Dockerfile .

build-docker-fakeexecutor:
$(gobuildlinux) -o ./bin/linux/fakeexecutor cmd/fakeexecutor/main.go
docker build $(dockerFlags) -t armada-fakeexecutor -f ./build/fakeexecutor/Dockerfile .

build-docker: build-docker-server build-docker-executor build-docker-fakeexecutor
build-docker: build-docker-server build-docker-executor build-docker-armadactl build-docker-fakeexecutor

build-ci: gobuild=$(gobuildlinux)
build-ci: build-docker build-armadactl build-load-tester
Expand Down

0 comments on commit 045ae2f

Please sign in to comment.