Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-04-21 13:37:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 91

Add fleetctl to generated Docker images (#1896)

Browse source
This commit is contained in:
Zachary Wasserman 2018-08-08 16:21:49 -07:00 committed by GitHub
parent 54f62183ee
commit 386bb8a9b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.dockerignore
View file

@ -1,2 +1,2 @@
*
!build/linux/fleet
!build/

2
Dockerfile
View file

@ -3,6 +3,6 @@ MAINTAINER Kolide Developers <engineering@kolide.co>
RUN apk --update add ca-certificates
COPY ./build/linux/fleet /usr/bin/fleet
COPY ./build/binary-bundle/linux/fleet ./build/binary-bundle/linux/fleetctl /usr/bin/
CMD ["fleet", "serve"]

3
Makefile
View file

@ -176,8 +176,7 @@ else
rm -f assets/bundle.js
endif
docker-build-release: .pre-fleet generate
GOOS=linux go build -i -o build/linux/${OUTPUT} -ldflags ${KIT_VERSION} ./cmd/fleet
docker-build-release: xp-fleet xp-fleetctl
docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" .
docker tag "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" kolide/fleet:latest