Skip to content

Commit f0d7c0e

Browse files
authored
Merge pull request #120 from matteb99/fix-porting
add favicon.ico and nginx config for doc, fix Dockerfile, remove debug from Dockerfile
2 parents 6d55cd0 + 88966a5 commit f0d7c0e

File tree

3 files changed

+33
-7
lines changed

3 files changed

+33
-7
lines changed

Dockerfile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@ RUN pip install -r /requirements-docs.txt
1111
COPY ./ /botogram
1212
RUN cd /botogram && invoke docs && cd .netlify && make
1313

14-
RUN apk add tree
15-
RUN tree /botogram/.netlify/build
16-
1714
# Image final
1815
FROM nginx:latest
19-
ENV botogram_version dev
16+
ARG botogram_version=dev
17+
ENV env_botogram_version=$botogram_version
2018
RUN rm /etc/nginx/conf.d/default.conf
21-
ADD https://gist.githubusercontent.com/matteb99/4ab0dffc07558273401220f3e0426f5a/raw/7fc18180327f57b6ab8bbbad9f629a0e5955a4a1/gistfile1.txt /etc/nginx/conf.d/default.conf
22-
RUN sed 's/RELEASE/'"$botogram_version"'/g' -i /etc/nginx/conf.d/default.conf
19+
COPY /nginx-doc.conf /etc/nginx/conf.d/default.conf
20+
RUN sed 's/RELEASE/'"$env_botogram_version"'/g' -i /etc/nginx/conf.d/default.conf
2321
COPY --from=BUILDER /botogram/.netlify/build/ ./botogram
24-

nginx-doc.conf

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
server {
2+
index index.php index.html;
3+
listen 80 default_server;
4+
root /botogram;
5+
error_log /var/log/nginx/error.log;
6+
access_log /var/log/nginx/access.log;
7+
keepalive_timeout 70;
8+
location = /favicon.ico {
9+
alias /botogram/favicon.ico;
10+
}
11+
location / {
12+
index index.php index.html index.htm;
13+
autoindex on;
14+
autoindex_exact_size off;
15+
autoindex_localtime on;
16+
}
17+
18+
location = /docs {
19+
return 301 /docs/RELEASE/;
20+
}
21+
22+
error_page 404 /404.html;
23+
24+
location = /404.html {
25+
root /botogram/;
26+
internal;
27+
}
28+
}
29+

website/favicon.ico

1.18 KB
Binary file not shown.

0 commit comments

Comments
 (0)