enforce deno version
+26
-5
+7
-3
Dockerfile
+7
-3
Dockerfile
···
8
8
ARG SMALLWEB_VERSION=dev
9
9
RUN go build -ldflags="-s -w -X github.com/pomdtr/smallweb/build.Version=${SMALLWEB_VERSION}" -o smallweb
10
10
11
-
FROM denoland/deno:2.2.2
11
+
FROM debian:bookworm-slim
12
12
COPY --from=builder /build/smallweb /usr/local/bin/smallweb
13
13
14
-
RUN apt update && apt install -y git && rm -rf /var/lib/apt/lists/*
14
+
RUN apt update && apt install -y git unzip curl && rm -rf /var/lib/apt/lists/*
15
+
16
+
ARG DENO_VERSION=v2.2.2
17
+
RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local/deno sh -s "$DENO_VERSION"
18
+
ENV PATH="/usr/local/deno/bin:$PATH"
15
19
16
20
ENV SMALLWEB_DIR=/smallweb
17
21
VOLUME ["$SMALLWEB_DIR"]
18
22
19
23
EXPOSE 7777 2222
20
24
ENTRYPOINT ["/usr/local/bin/smallweb"]
21
-
CMD [ "up", "--cron", "--addr", ":7777", "--ssh-addr", ":2222" ]
25
+
CMD [ "up", "--enable-crons", "--addr", ":7777", "--ssh-addr", ":2222"]
+4
-2
cmd/doctor.go
+4
-2
cmd/doctor.go
···
10
10
"github.com/spf13/cobra"
11
11
)
12
12
13
+
var minimumDenoVersion = semver.MustParse("2.2.0")
14
+
13
15
func NewCmdDoctor() *cobra.Command {
14
16
cmd := &cobra.Command{
15
17
Use: "doctor",
···
69
71
return "", err
70
72
}
71
73
72
-
if v.Major() < 2 {
73
-
return "", fmt.Errorf("deno version 2 or higher required")
74
+
if v.LessThan(minimumDenoVersion) {
75
+
return denoVersion, fmt.Errorf("deno version %s is too old, please upgrade to %s or newer", denoVersion, minimumDenoVersion)
74
76
}
75
77
76
78
return v.String(), nil
+7
cmd/run.go
+7
cmd/run.go
···
13
13
Use: "run <app> [args...]",
14
14
Short: "Run an app cli",
15
15
ValidArgsFunction: completeApp,
16
+
PreRunE: func(cmd *cobra.Command, args []string) error {
17
+
if _, err := checkDenoVersion(); err != nil {
18
+
return err
19
+
}
20
+
21
+
return nil
22
+
},
16
23
RunE: func(cmd *cobra.Command, args []string) error {
17
24
if len(args) == 0 {
18
25
return cmd.Help()
+8
cmd/up.go
+8
cmd/up.go
···
61
61
return fmt.Errorf("domain cannot be empty")
62
62
}
63
63
64
+
if k.String("dir") == "" {
65
+
return fmt.Errorf("dir cannot be empty")
66
+
}
67
+
68
+
if _, err := checkDenoVersion(); err != nil {
69
+
return err
70
+
}
71
+
64
72
oldCronFlag, _ := cmd.Flags().GetBool("cron")
65
73
if oldCronFlag {
66
74
flags.enableCrons = true