diff --git a/Dockerfile b/Dockerfile index 0de64e5c506848d1ec05d290d9fa1507647b8e40..ff22a24c2a9fbc58a0653a992552fab323ff0d30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,7 @@ ADD . ./ RUN CGO_ENABLED=0 GOOS=linux go build -o /piratar FROM alpine -WORKDIR /app -COPY --from=build-stage /piratar /app -COPY default.jpg /app +WORKDIR / +COPY --from=build-stage /piratar / EXPOSE 3000 -ENTRYPOINT ["/app/piratar"] +ENTRYPOINT ["/piratar"] diff --git a/VERSION b/VERSION index 4a36342fcab700951adb18ae7adc930997f6c3f4..fd2a01863fdd3035fac5918c59666363544bfe23 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0 +3.1.0 diff --git a/default.jpg b/default.jpg index 2e4e37de92cb93a4fb1b260d7aa6611a09a3f9a6..aab2a5f4c994bd5fcb09f2fddba79192c2cc57ce 100644 Binary files a/default.jpg and b/default.jpg differ diff --git a/main.go b/main.go index 8635994e0016fc991dd316899a101efbbd4f29cf..b4d9d5dfa2d7d2cd01b766de07b1faa9c28edd3b 100644 --- a/main.go +++ b/main.go @@ -4,11 +4,15 @@ import ( "fmt" "log" "path" + "embed" "strings" "net/http" "pirates/piratar/octopus" ) +//go:embed default.jpg +var fs embed.FS + func main() { http.HandleFunc("/", handler) @@ -34,7 +38,9 @@ func handler(w http.ResponseWriter, r *http.Request) { http.Redirect(w, r, photo, http.StatusFound) } else { fmt.Printf("Piratar for %s not found\n", id) + avatar, _ := fs.ReadFile("default.jpg") w.Header().Set("Content-Type", "image/jpeg") - http.ServeFile(w, r, "default.jpg") + w.Header().Set("Content-Length", fmt.Sprintf("%d", len(avatar))) + w.Write(avatar) } }