Skip to content

Commit c03df65

Browse files
committed
fix build and tests
1 parent 32f3863 commit c03df65

4 files changed

Lines changed: 9 additions & 5 deletions

File tree

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM golang:1-alpine3.7 as builder
1+
FROM golang:1-alpine3.22 AS builder
22
WORKDIR /go/src/entrypoint
3+
COPY ./go.mod /go/src/entrypoint
34
COPY ./entrypoint.go /go/src/entrypoint/
45
RUN go build
56

Dockerfile-tests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1-alpine3.7
1+
FROM golang:1-alpine3.22
22
WORKDIR /go/src/entrypoint
33
COPY ./go.mod /go/src/entrypoint
44
COPY ./entrypoint.go /go/src/entrypoint/

entrypoint.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ func BuildReplacementsFromEnv() ([]Replacement, error) {
122122
return configReplacements, fmt.Errorf("missing required env var: %s. Description: %s", envvar.Name, envvar.Desc)
123123
}
124124

125+
if envvar.Default == "" {
126+
continue
127+
}
128+
125129
value = envvar.Default
126130
}
127131

entrypoint_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ func TestBuildReplacementsFromEnv(t *testing.T) {
4646
t.Fatal(err)
4747
}
4848

49-
replacementsCount := len(replacements)
50-
if replacementsCount != 6 {
51-
t.Fatal("Replacements did not have enough entries, only found", replacementsCount, "but expected 6")
49+
if want, got := 7, len(replacements); want != got {
50+
t.Fatal("Replacements did not have enough entries: found", got, "but expected", want)
5251
}
5352
}
5453

0 commit comments

Comments
 (0)