Skip to content

Commit

Permalink
Merge branch 'master' into releases/1.6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
mmetc committed Feb 5, 2025
2 parents c7ef2a9 + bf0a1cc commit ec4055f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.io/golang:1.23-alpine3.20 AS build
FROM docker.io/golang:1.23-alpine3.21 AS build

ARG BUILD_VERSION

Expand Down Expand Up @@ -30,7 +30,7 @@ RUN make clean release DOCKER_BUILD=1 BUILD_STATIC=1 CGO_CFLAGS="-D_LARGEFILE64_
# In case we need to remove agents here..
# cscli machines list -o json | yq '.[].machineId' | xargs -r cscli machines delete

FROM docker.io/alpine:latest AS slim
FROM docker.io/alpine:3.21 AS slim

RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community tzdata bash rsync && \
mkdir -p /staging/etc/crowdsec && \
Expand Down
6 changes: 6 additions & 0 deletions pkg/hubops/plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ package hubops

import (
"context"
"errors"
"fmt"
"io"
"os"
"slices"
"strings"
Expand Down Expand Up @@ -203,7 +205,11 @@ func (p *ActionPlan) Confirm(verbose bool) (bool, error) {
Default: true,
}

// in case of EOF, it's likely been closed by the package manager (freebsd?), ignore it
if err := survey.AskOne(prompt, &answer); err != nil {
if errors.Is(err, io.EOF) {
return prompt.Default, nil
}
return false, err
}

Expand Down

0 comments on commit ec4055f

Please sign in to comment.