Skip to content

Commit a87de8e

Browse files
committedMay 5, 2020
add slashes
1 parent a836cec commit a87de8e

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed
 

‎Dockerfile

+2-4
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ FROM alpine:3.9 AS builder
22
MAINTAINER "Xavier Garnier <xavier.garnier@irisa.fr>"
33

44
ENV MODE prod
5-
6-
RUN apk add --update --no-cache bash make python3 python3-dev libxslt-dev musl-dev gcc jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev harfbuzz-dev fribidi-dev
7-
85
COPY . /website
96
WORKDIR /website
107

11-
RUN make install && make build
8+
RUN apk add --update --no-cache bash make python3 python3-dev libxslt-dev musl-dev gcc jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev harfbuzz-dev fribidi-dev && \
9+
make install clean build
1210

1311
# Final image
1412
FROM nginx:1.18.0-alpine

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ help:
2525
@echo 'Usage:'
2626
@echo ' make help Display help'
2727
@echo ' make install [MODE=dev] Install Python dependencies in a virtual environment'
28-
@echo ' make build (re)generate the web site '
29-
@echo ' make clean remove the generated files '
30-
@echo ' make serve [PORT=8000] serve site at http://localhost:8000 '
28+
@echo ' make build (Re)generate the web site '
29+
@echo ' make clean Remove the generated files '
30+
@echo ' make serve [PORT=8000] Serve site at http://localhost:8000 '
3131
@echo ' make uninstall Uninstall python dependencies'
3232

3333
check-python:

‎conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139

140140
NAVIGATION_LINKS = {
141141
DEFAULT_LANG: (
142-
("/news", 'News'),
142+
("/news/", 'News'),
143143
),
144144
}
145145

@@ -148,7 +148,7 @@
148148
# (Bootstrap 4: right-side of navbar, Bootblog 4: right side of title)
149149
NAVIGATION_ALT_LINKS = {
150150
DEFAULT_LANG: (
151-
("/about", "About"),
151+
("/about/", "About"),
152152
),
153153
}
154154

0 commit comments

Comments
 (0)
Please sign in to comment.