Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ LABEL maintainer="StackRox" \
io.k8s.display-name="roxie ACS Deployment Tool"

# Install required tools via microdnf
# kubectl, helm, skopeo are available in RHEL repos
# kubectl, helm are available in RHEL repos
# Note: UBI minimal comes with curl pre-installed, which is sufficient for our needs
RUN microdnf install -y \
# Core utilities
Expand All @@ -53,7 +53,7 @@ RUN microdnf install -y \
unzip \
ca-certificates \
# Container tools
skopeo \
podman \
# Python (required for gcloud SDK)
python3 \
# Clean up
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ test-e2e: build ## Run end-to-end tests (requires kubectl context and cluster ac
echo "❌ No kubectl context found. Please configure kubectl first."; \
exit 1; \
fi
@if ! command -v skopeo >/dev/null 2>&1; then \
echo "❌ skopeo not found. Please install skopeo for E2E tests."; \
@if ! command -v podman >/dev/null 2>&1; then \
echo "❌ podman not found. Please install podman for E2E tests."; \
exit 1; \
fi
$(GOTEST) -v -tags=e2e -timeout=120m -parallel=1 ./tests/e2e/...
Expand Down
6 changes: 2 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
echo " - helm ($(helm version --short 2>/dev/null || echo 'unknown'))"
echo " - Go $(go version | cut -d' ' -f3)"
echo ""
echo "💡 For container tools (skopeo, podman), use:"
echo "💡 For full set of pre-installed tooling use:"
echo " nix develop .#full"
echo ""
echo "Run 'roxie --help' to get started"
Expand All @@ -120,8 +120,7 @@
k9s
stern

# Container tools (heavy dependencies!)
skopeo
# Container tools:
podman

# Load balancer
Expand All @@ -135,7 +134,6 @@
echo " - roxie ($(roxie version))"
echo " - kubectl ($(kubectl version --client --short 2>/dev/null || echo 'not configured'))"
echo " - helm ($(helm version --short 2>/dev/null || echo 'unknown'))"
echo " - skopeo ($(skopeo --version | head -n1))"
echo " - podman ($(podman --version | head -n1))"
echo " - haproxy ($(haproxy -v | head -n1))"
echo ""
Expand Down
2 changes: 1 addition & 1 deletion internal/deployer/deployer.go
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ func (d *Deployer) waitForNamespaceDeletion(namespace string) error {

// checkRequiredTools verifies that required CLI tools are available
func checkRequiredTools() error {
requiredTools := []string{"kubectl", "roxctl", "skopeo"}
requiredTools := []string{"kubectl", "roxctl"}

var missing []string
for _, tool := range requiredTools {
Expand Down
5 changes: 2 additions & 3 deletions internal/imagecache/imagecache.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,11 +132,10 @@ func (ic *ImageCache) VerifyImagePullable(imageRef string) bool {
return true
}

// Use skopeo to check if image is pullable
_, stderr, err := helpers.RunCommandWithOutput(
"Verifying image pullability",
"skopeo",
[]string{"inspect", "--raw", fmt.Sprintf("docker://%s", imageRef)},
"podman",
[]string{"manifest", "inspect", imageRef},
)

if err == nil {
Expand Down
1 change: 0 additions & 1 deletion tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ make test-short
E2E tests require:
- A running Kubernetes cluster
- `kubectl` configured with the target cluster context
- `skopeo` for image verification
- The roxie binary built (`make build`)

Run E2E tests:
Expand Down
5 changes: 0 additions & 5 deletions tests/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ func TestMain(m *testing.M) {
os.Exit(1)
}

if err := requireBinary("skopeo"); err != nil {
fmt.Fprintf(os.Stderr, "skopeo not found: %v\n", err)
os.Exit(1)
}

// Set default MAIN_IMAGE_TAG if not set
if os.Getenv("MAIN_IMAGE_TAG") == "" {
os.Setenv("MAIN_IMAGE_TAG", defaultMainImageTag)
Expand Down