Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove fleetctl binary from fleetdm/fleet image and remove unused Dockerfile #25749

Merged
merged 1 commit into from
Jan 28, 2025
Merged

Remove fleetctl binary from fleetdm/fleet image and remove unused Dockerfile #25749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions Dockerfile
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems our release scripts use tools/fleet-docker/Dockerfile (which almost looks the same).

This file was deleted.

10 changes: 0 additions & 10 deletions Makefile
View file
Open in desktop
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Haven't found any references to these Makefile targets.

Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,6 @@ clean: clean-assets
clean-assets:
git clean -fx assets

docker-build-release: xp-fleet xp-fleetctl
docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" .
docker tag "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" fleetdm/fleet:${VERSION}
docker tag "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" fleetdm/fleet:latest

docker-push-release: docker-build-release
docker push "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}"
docker push fleetdm/fleet:${VERSION}
docker push fleetdm/fleet:latest

fleetctl-docker: xp-fleetctl
docker build -t fleetdm/fleetctl --platform=linux/amd64 -f tools/fleetctl-docker/Dockerfile .

Expand Down
1 change: 1 addition & 0 deletions changes/25748-remove-fleetctl-from-fleetdm-fleet-docker-image
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Removed `fleetctl` binary from the `fleetdm/fleet` docker image.
1 change: 0 additions & 1 deletion tools/fleet-docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ RUN addgroup -S fleet && adduser -S fleet -G fleet
USER fleet

COPY fleet /usr/bin/
COPY fleetctl /usr/bin/
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me know if there's a reason to keep the fleetctl executable on the fleetdm/fleet docker image.


CMD ["fleet", "serve"]
Loading