mod mgmt nginx

Dockerfile

@@ -8,6 +8,32 @@ RUN bundle exec jekyll build
 
 #Copy _sites from build to Nginx Container to serve site
 FROM nginx:latest
+
+RUN mkdir -p /var/cache/nginx \
+             /var/log/nginx \
+             /var/lib/nginx \
+             /usr/share/nginx/html
+
+RUN touch /var/run/nginx.pid
+
+RUN groupadd user
+RUN useradd -d /home/user -ms /bin/bash -g user -G user -p user user
+RUN chown -R user:user /var/cache/nginx \
+                       /var/log/nginx \
+                       /var/lib/nginx \
+                       /var/run/nginx.pid \
+                       /usr/share/nginx/html
+
+#--- update nginx config;  establish routes/proxy pass;  remove user directive
+COPY ./nginx/etc.nginx.confd_default.conf /etc/nginx/conf.d/default.conf
+COPY ./nginx/etc.nginx_nginx.conf /etc/nginx/nginx.conf
+
+
 COPY --from=builder /usr/src/app/_site /usr/share/nginx/html
-EXPOSE 80
-CMD ["nginx", "-g", "daemon off;"]
+
+COPY --chown=user ./_env_config/stg_dev/utl_dkr_preRun.sh ./scripts/docker/
+
+EXPOSE 7860
+ENTRYPOINT [ "./scripts/docker/utl_dkr_preRun.sh" ]
+
+# CMD ["nginx", "-g", "daemon off;"]

_env_config/stg_dev/utl_dkr_preRun.sh

@@ -0,0 +1,41 @@
+#!/bin/bash
+
+#--- Note:  this file is designed to run locally as well as within docker to prep the environment
+#--- Entry:  this script is assumed to run from the /app root folder
+#--- Usage:  ./_env_config/local_dev/utl_dkr_preRun.sh
+
+#--- for volume initialization; ensure folders are in place; assume:  we are in the /app folder
+
+
+<<blockComment 
+- 
+blockComment
+echo -e "INFO(utl_dkr_preRun):\t Initializing ..."
+
+# strpth_pwd=$(pwd)
+# strpth_scriptLoc=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+# strpth_scrHome="${strpth_scriptLoc}/../"
+# strpth_appHome="${strpth_scrHome}../"
+# strpth_scrModels="${strpth_scrHome}models/"
+
+# #echo "strpth_appHome = ${strpth_appHome}"
+
+#--- for nginx;  external 7860;  internal 7860
+echo "INFO:  starting nginx ..."
+# service nginx start
+exec nginx -g "daemon off;"
+
+
+# #--- for fastapi;  external 49132;  internal 39132
+# echo "INFO:  starting fastapi ..."
+# uvicorn --app-dir=./fastapi entry_fastapi:app --reload --workers 1 --host 0.0.0.0 --port 39132 &          #--- specify a non-root app dir
+
+
+# #--- for streamlit;  external 49131;  internal 39131
+# echo "INFO:  starting streamlit ..."
+# streamlit run ./streamlit/entry_streamlit.py --server.port=39131 --server.maxUploadSize=2000            #--- & run in the background
+
+
+
+<<blockErrorLog
+blockErrorLog

nginx/etc.nginx.confd_default.conf

@@ -0,0 +1,94 @@
+server {
+    #listen         80;
+    listen          7860;
+    server_name     localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    #--- Note:  we have a basic web server with entry points and routes
+
+
+    # #--- streamlit
+    # location / {
+    #     proxy_pass http://127.0.0.1:39131/;                     #--- default streamlit landing page
+    #     proxy_http_version 1.1;
+    #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    #     proxy_set_header Host $host;
+    #     proxy_set_header Upgrade $http_upgrade;
+    #     proxy_set_header Connection "upgrade";
+    #     proxy_read_timeout 86400;
+    # }
+    # location ~ ^/(streamlit|web)/ {
+    #     rewrite ^/streamlit/(.*) /$1 last;
+    #     rewrite ^/web/(.*) /$1 last;
+    #     return 403; 
+    # }
+
+
+    # #--- fastapi
+    # #--- WARN: the below combined OR directive does not work
+    # #location ~ ^/(api|fastapi|api2|fastapi2)/
+    # location /api/ {
+    #     proxy_pass http://127.0.0.1:39132/;                      #--- default fastapi landing page
+    #     proxy_buffering off;
+    #     proxy_set_header X-Real-IP $remote_addr;
+    #     proxy_set_header X-Forwarded-Host $host;
+    #     proxy_set_header X-Forwarded-Port $server_port;
+    # }
+    # location ~ ^/(fastapi|api2|fastapi2)/ {
+    #     rewrite ^/fastapi/(.*) /api/$1 last;
+    #     rewrite ^/api2/(.*) /api/$1 last;
+    #     rewrite ^/fastapi2/(.*) /api/$1 last;
+    #     return 403; 
+    # }
+
+    # #--- gradio
+    # location /gradio/ {
+    #     proxy_pass http://127.0.0.1:39133/;                      #--- default gradio landing page
+    #     proxy_buffering off;
+    #     proxy_set_header X-Real-IP $remote_addr;
+    #     proxy_set_header X-Forwarded-Host $host;
+    #     proxy_set_header X-Forwarded-Port $server_port;
+    # }
+
+    #location /admin/nginx/ {
+    #    #rewrite ^(/download/.*)/media/(\w+)\.?.*$ $1/mp3/$2.mp3 last;
+    #    #return 403;
+    #
+    #    root   /usr/share/nginx/html;
+    #    index  index.html index.htm;
+    #}
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}
+

nginx/etc.nginx.sites-available.default

@@ -0,0 +1,91 @@
+##
+# You should look at the following URL's in order to grasp a solid understanding
+# of Nginx configuration files in order to fully unleash the power of Nginx.
+# https://www.nginx.com/resources/wiki/start/
+# https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/
+# https://wiki.debian.org/Nginx/DirectoryStructure
+#
+# In most cases, administrators will remove this file from sites-enabled/ and
+# leave it as reference inside of sites-available where it will continue to be
+# updated by the nginx packaging team.
+#
+# This file will automatically load configuration files provided by other
+# applications, such as Drupal or Wordpress. These applications will be made
+# available underneath a path with that package name, such as /drupal8.
+#
+# Please see /usr/share/doc/nginx-doc/examples/ for more detailed examples.
+##
+
+# Default server configuration
+#
+server {
+	listen 80 default_server;
+	#listen [::]:80 default_server;								#--- IM:  disable ipv6 dependency
+
+	# SSL configuration
+	#
+	# listen 443 ssl default_server;
+	# listen [::]:443 ssl default_server;
+	#
+	# Note: You should disable gzip for SSL traffic.
+	# See: https://bugs.debian.org/773332
+	#
+	# Read up on ssl_ciphers to ensure a secure configuration.
+	# See: https://bugs.debian.org/765782
+	#
+	# Self signed certs generated by the ssl-cert package
+	# Don't use them in a production server!
+	#
+	# include snippets/snakeoil.conf;
+
+	root /var/www/html;
+
+	# Add index.php to the list if you are using PHP
+	index index.html index.htm index.nginx-debian.html;
+
+	server_name _;
+
+	location / {
+		# First attempt to serve request as file, then
+		# as directory, then fall back to displaying a 404.
+		try_files $uri $uri/ =404;
+	}
+
+	# pass PHP scripts to FastCGI server
+	#
+	#location ~ \.php$ {
+	#	include snippets/fastcgi-php.conf;
+	#
+	#	# With php-fpm (or other unix sockets):
+	#	fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
+	#	# With php-cgi (or other tcp sockets):
+	#	fastcgi_pass 127.0.0.1:9000;
+	#}
+
+	# deny access to .htaccess files, if Apache's document root
+	# concurs with nginx's one
+	#
+	#location ~ /\.ht {
+	#	deny all;
+	#}
+}
+
+
+# Virtual Host configuration for example.com
+#
+# You can move that to a different file under sites-available/ and symlink that
+# to sites-enabled/ to enable it.
+#
+#server {
+#	listen 80;
+#	listen [::]:80;
+#
+#	server_name example.com;
+#
+#	root /var/www/example.com;
+#	index index.html;
+#
+#	location / {
+#		try_files $uri $uri/ =404;
+#	}
+#}

nginx/etc.nginx_nginx.conf

@@ -0,0 +1,24 @@
+# nginx.conf
+pid /var/run/nginx.pid; 
+
+worker_processes  auto;
+
+events {
+  worker_connections  1024;
+}
+
+http {
+  include       /etc/nginx/mime.types;
+  default_type  application/octet-stream;
+
+  server {
+    listen       7860;
+    server_name  localhost;
+    root         /usr/share/nginx/html;
+    index        index.html;
+
+    location / {
+      try_files $uri $uri/ =404;
+    }
+  }
+}