Skip to content

Commit

Permalink
more work on development of documentation to split out into github pages
Browse files Browse the repository at this point in the history
  • Loading branch information
mmguero committed Oct 5, 2022
1 parent f558cd2 commit 48ac4f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Dockerfiles/nginx.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@ ADD . /site

WORKDIR /site

# build documentation, remove unnecessary files, then massage a bit to work nicely with NGINX (which will be serving it)
RUN docker-entrypoint.sh bundle exec jekyll build && \
find /site/_site -type f -name "*.md" -delete
find /site/_site -type f -name "*.md" -delete && \
find /site/_site -type f -name "*.html" -exec sed -i "s@/\(docs\|assets\)@/readme/\1@g" "{}" \; && \
find /site/_site -type f -name "*.html" -exec sed -i 's@\(href=\)"/"@\1"/readme"@g' "{}" \;

# build NGINX image
FROM alpine:3.16
Expand Down
3 changes: 3 additions & 0 deletions nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ http {
# Malcolm readme
location /readme {
root /usr/share/nginx/html;
try_files $uri $uri/index.html;
}

# Malcolm file upload
Expand Down Expand Up @@ -231,12 +232,14 @@ http {
proxy_set_header Authorization "";
}

# Malcolm API
location /mapi {
proxy_pass http://api/;
proxy_redirect off;
proxy_set_header Host api.malcolm.local;
}

# Arkime
location / {
proxy_pass http://arkime;
proxy_redirect off;
Expand Down

0 comments on commit 48ac4f4

Please sign in to comment.