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.

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

Conversation

lucasmrod
Copy link
Member

@lucasmrod lucasmrod commented Jan 24, 2025

For #25748.

Manually tested by:

  1. Building a fleet executable for Linux on a Ubuntu VM (with -extldflags "-static") for Alpine.
  2. Placing the executable in tools/fleet-docker.
  3. Building a local docker image using docker build -t fleetdm/fleet:v42.42.42 --platform=linux/amd64 ..
  4. Running the docker image (using docker run) and use Fleet on the browser.
docker run -v $(pwd)/../osquery:/run -p 8412:8412 -e FLEET_MYSQL_ADDRESS=host.docker.internal:3306 -e FLEET_MYSQL_DATABASE=fleet -e FLEET_MYSQL_USERNAME=fleet -e FLEET_MYSQL_PASSWORD=insecure -e FLEET_REDIS_ADDRESS=host.docker.internal:6379 -e FLEET_SERVER_ADDRESS=0.0.0.0:8412 -e FLEET_SERVER_CERT=/run/fleet.crt -e FLEET_SERVER_KEY=/run/fleet.key -e FLEET_LOGGING_JSON='true' -e FLEET_VULNERABILITIES_CURRENT_INSTANCE_CHECKS="yes" -e FLEET_VULNERABILITIES_DATABASES_PATH=/vulndb -e FLEET_LOGGING_DEBUG='true' -it fleetdm/fleet:v42.42.42
  • Changes file added for user-visible changes in changes/, orbit/changes/ or ee/fleetd-chrome/changes.
    See Changes files for more information.
  • Manual QA for all new/changed functionality

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).

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.

@@ -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.

@lucasmrod lucasmrod merged commit a4db139 into main Jan 28, 2025
3 checks passed
@lucasmrod lucasmrod deleted the remove-fleetctl-from-fleetdm-fleet-docker-image branch January 28, 2025 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants