diff --git a/Dockerfile b/Dockerfile index 2c6ee52..307276b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,13 +7,12 @@ RUN CGO_ENABLED=0 GOBIN=/root go install -v ./cmd/site FROM xena/alpine EXPOSE 5000 RUN apk add --no-cache bash -COPY --from=build /root/site /site/site +WORKDIR /site +COPY --from=build /root/site . COPY ./static /site/static COPY ./templates /site/templates COPY ./blog /site/blog COPY ./css /site/css -COPY ./run.sh /site/run.sh COPY ./app /app - HEALTHCHECK CMD wget --spider http://127.0.0.1:5000 || exit 1 -CMD /site/run.sh +CMD ./site diff --git a/cmd/site/html.go b/cmd/site/html.go index ba304c5..5c6b828 100644 --- a/cmd/site/html.go +++ b/cmd/site/html.go @@ -56,9 +56,10 @@ func (s *Site) showPost(w http.ResponseWriter, r *http.Request) { return } + cmp := r.URL.Path[1:] var p *Post for _, pst := range s.Posts { - if pst.Link == r.RequestURI[1:] { + if pst.Link == cmp { p = pst } }