aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Dodrill <me@christine.website>2018-12-10 08:14:00 -0800
committerChristine Dodrill <me@christine.website>2018-12-10 08:16:53 -0800
commit8ff1e285d8bf208fdf2653b42856b4356b853949 (patch)
tree48bc07a566539806992749ac4089c2d3f2f3dfe4
parentcbfa82218c60a4a1c52f4d217f6f053de8fcad4e (diff)
downloadxesite-8ff1e285d8bf208fdf2653b42856b4356b853949.tar.xz
xesite-8ff1e285d8bf208fdf2653b42856b4356b853949.zip
cmd/site: ignore url params
-rw-r--r--Dockerfile7
-rw-r--r--cmd/site/html.go3
2 files changed, 5 insertions, 5 deletions
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
}
}