Lab4 Updates (#16)

* Updated lab4 readme, media file names and lab2 container names

* prerequisites (#13)

* Remove unneeded files

* Updated images and readme to reflect new workshop

* Updated screenshots to reflect new workshop name and UI changes.

* Added direct link to mange config sync groups on docs site.

* Made all suggested changes from PR review

---------

Co-authored-by: Shouvik Dutta <[email protected]>

Author: apcurrier

labs/lab2/docker-compose.yml

@@ -5,160 +5,160 @@
 # Chris Akker, Shouvik Dutta, Adam Currier
 #
 services:
-  basics-plus1:                  # Alpine NGINX Plus Web / Load Balancer
+  basics-plus1: # Alpine NGINX Plus Web / Load Balancer
     environment:
-      NGINX_AGENT_SERVER_HOST: "agent.connect.nginx.com"
-      NGINX_AGENT_SERVER_GRPCPORT: "443"
-      NGINX_AGENT_TLS_ENABLE: "true"
-      NGINX_AGENT_SERVER_TOKEN: $TOKEN  # Datakey Fron basics- One Console
-#      NGINX_AGENT_INSTANCE_GROUP: basics-workshop-plus
-    hostname: basics-plus1
-    container_name: basics-plus1
-    image: private-registry.nginx.com/nginx-plus/agent:nginx-plus-r32-alpine-3.20-20240613  # CVE - From Nginx Private Registry
-    volumes:                    # Sync these folders to container
-        - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
-        - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
-        - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey From One Console
+    #  NGINX_AGENT_INSTANCE_GROUP: one-workshop-plus
+    hostname: one-workshop-plus1
+    container_name: one-workshop-plus1
+    image: private-registry.nginx.com/nginx-plus/agent:nginx-plus-r32-alpine-3.20-20240613 # CVE - From Nginx Private Registry
+    volumes: # Sync these folders to container
+      - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
+      - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
+      - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
     ports:
-        - 80:80       # Open for HTTP
-        - 443:443     # Open for HTTPS
-        - 9000:9000   # Open for stub status page
-        - 9113:9113   # Open for Prometheus Scraper page
+      - 80:80 # Open for HTTP
+      - 443:443 # Open for HTTPS
+      - 9000:9000 # Open for stub status page
+      - 9113:9113 # Open for Prometheus Scraper page
     restart: always
   #
-  basics-plus2:                  # Alpine NGINX Plus Web / Load Balancer
+  basics-plus2: # Alpine NGINX Plus Web / Load Balancer
     environment:
-      NGINX_AGENT_SERVER_HOST: "agent.connect.nginx.com"
-      NGINX_AGENT_SERVER_GRPCPORT: "443"
-      NGINX_AGENT_TLS_ENABLE: "true"
-      NGINX_AGENT_SERVER_TOKEN: $TOKEN  # Datakey Fron Nginx One Console
-#      NGINX_AGENT_INSTANCE_GROUP: basics-workshop-plus
-    hostname: basics-plus2
-    container_name: basics-plus2
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey Fron Nginx One Console
+    #  NGINX_AGENT_INSTANCE_GROUP: one-workshop-plus
+    hostname: one-workshop-plus2
+    container_name: one-workshop-plus2
     image: private-registry.nginx.com/nginx-plus/agent:nginx-plus-r31-alpine-3.19-20240522 # CVE - From Nginx Private Registry
-    volumes:                    # Sync these folders to container
-        - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
-        - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
-        - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
+    volumes: # Sync these folders to container
+      - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
+      - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
+      - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
     ports:
-        - "80"      # Open for HTTP
-        - "443"     # Open for HTTPS
-        - "9000"    # Open for API / Dashboard page
-        - "9113"    # Open for Prometheus Scraper page
+      - '80' # Open for HTTP
+      - '443' # Open for HTTPS
+      - '9000' # Open for API / Dashboard page
+      - '9113' # Open for Prometheus Scraper page
     restart: always
   #
-  basics-plus3:                  # RHEL UBI NGINX Plus Web / Load Balancer
+  basics-plus3: # RHEL UBI NGINX Plus Web / Load Balancer
     environment:
-      NGINX_AGENT_SERVER_HOST: "agent.connect.nginx.com"
-      NGINX_AGENT_SERVER_GRPCPORT: "443"
-      NGINX_AGENT_TLS_ENABLE: "true"
-      NGINX_AGENT_SERVER_TOKEN: $TOKEN  # Datakey Fron Nginx One Console
-#      NGINX_AGENT_INSTANCE_GROUP: basics-workshop-plus
-    hostname: basics-plus3
-    container_name: basics-plus3
-    image: private-registry.nginx.com/nginx-plus/agent:nginx-plus-r31-ubi-9-20240522    # From Nginx Private Registry
-    volumes:                    # Sync these folders to container
-        - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
-        - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
-        - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey Fron Nginx One Console
+    #  NGINX_AGENT_INSTANCE_GROUP: one-workshop-plus
+    hostname: one-workshop-plus3
+    container_name: one-workshop-plus3
+    image: private-registry.nginx.com/nginx-plus/agent:nginx-plus-r31-ubi-9-20240522 # From Nginx Private Registry
+    volumes: # Sync these folders to container
+      - ./nginx-plus/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-plus/etc/nginx/conf.d:/etc/nginx/conf.d
+      - ./nginx-plus/etc/nginx/includes:/etc/nginx/includes
+      - ./nginx-plus/usr/share/nginx/html:/usr/share/nginx/html
     ports:
-        - "80"      # Open for HTTP
-        - "443"     # Open for HTTPS
-        - "9000"    # Open for API / Dashboard page
-        - "9113"    # Open for Prometheus Scraper page
+      - '80' # Open for HTTP
+      - '443' # Open for HTTPS
+      - '9000' # Open for API / Dashboard page
+      - '9113' # Open for Prometheus Scraper page
     restart: always
   #
-  basics-oss1:                  # Debian NGINX OSS Web / Load Balancer
+  basics-oss1: # Debian NGINX OSS Web / Load Balancer
     environment:
-      NGINX_AGENT_SERVER_HOST: "agent.connect.nginx.com"
-      NGINX_AGENT_SERVER_GRPCPORT: "443"
-      NGINX_AGENT_TLS_ENABLE: "true"
-      NGINX_AGENT_SERVER_TOKEN: $TOKEN  # Datakey Fron Nginx One Console
-    hostname: basics-oss1
-    container_name: basics-oss1
-    image: docker-registry.nginx.com/nginx/agent:mainline  # From Docker Public Registry
-    volumes:                    # Sync these folders to container
-        - ./nginx-oss/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx-oss/etc/nginx/conf.d:/etc/nginx/conf.d
-        - ./nginx-oss/etc/nginx/includes:/etc/nginx/includes
-        - ./nginx-oss/etc/ssl/nginx:/etc/ssl/nginx
-        - ./nginx-oss/usr/share/nginx/html:/usr/share/nginx/html
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey Fron Nginx One Console
+    hostname: one-workshop-oss1
+    container_name: one-workshop-oss1
+    image: docker-registry.nginx.com/nginx/agent:mainline # From Docker Public Registry
+    volumes: # Sync these folders to container
+      - ./nginx-oss/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-oss/etc/nginx/conf.d:/etc/nginx/conf.d
+      - ./nginx-oss/etc/nginx/includes:/etc/nginx/includes
+      - ./nginx-oss/etc/ssl/nginx:/etc/ssl/nginx
+      - ./nginx-oss/usr/share/nginx/html:/usr/share/nginx/html
     ports:
-        - "80"      # Open for HTTP
-        - "443"     # Open for HTTPS
-        - "9000"    # Open for stub status page
-        - "9113"    # Open for Prometheus Scraper page
+      - '80' # Open for HTTP
+      - '443' # Open for HTTPS
+      - '9000' # Open for stub status page
+      - '9113' # Open for Prometheus Scraper page
     restart: always
   #
-  basics-oss2:                  # Alpine NGINX OSS Web / Load Balancer
+  basics-oss2: # Alpine NGINX OSS Web / Load Balancer
     environment:
-      NGINX_AGENT_SERVER_HOST: "agent.connect.nginx.com"
-      NGINX_AGENT_SERVER_GRPCPORT: "443"
-      NGINX_AGENT_TLS_ENABLE: "true"
-      NGINX_AGENT_SERVER_TOKEN: $TOKEN  # Datakey Fron Nginx One Console
-    hostname: basics-oss2
-    container_name: basics-oss2
-    image: docker-registry.nginx.com/nginx/agent:alpine  # From Docker Public Registry
-    volumes:                    # Sync these folders to container
-        - ./nginx-oss/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx-oss/etc/nginx/conf.d:/etc/nginx/conf.d
-        - ./nginx-oss/etc/nginx/includes:/etc/nginx/includes
-        - ./nginx-oss/etc/ssl/nginx:/etc/ssl/nginx
-        - ./nginx-oss/usr/share/nginx/html:/usr/share/nginx/html
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey Fron Nginx One Console
+    hostname: one-workshop-oss2
+    container_name: one-workshop-oss2
+    image: docker-registry.nginx.com/nginx/agent:alpine # From Docker Public Registry
+    volumes: # Sync these folders to container
+      - ./nginx-oss/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-oss/etc/nginx/conf.d:/etc/nginx/conf.d
+      - ./nginx-oss/etc/nginx/includes:/etc/nginx/includes
+      - ./nginx-oss/etc/ssl/nginx:/etc/ssl/nginx
+      - ./nginx-oss/usr/share/nginx/html:/usr/share/nginx/html
     ports:
-        - "80"      # Open for HTTP
-        - "443"     # Open for HTTPS
-        - "9000"    # Open for stub status page
-        - "9113"    # Open for Prometheus Scraper page
+      - '80' # Open for HTTP
+      - '443' # Open for HTTPS
+      - '9000' # Open for stub status page
+      - '9113' # Open for Prometheus Scraper page
     restart: always
     #
-  basics-oss3:                  # Older Alpine NGINX OSS Web / Load Balancer
+  basics-oss3: # Older Alpine NGINX OSS Web / Load Balancer
     environment:
-      NGINX_AGENT_SERVER_HOST: "agent.connect.nginx.com"
-      NGINX_AGENT_SERVER_GRPCPORT: "443"
-      NGINX_AGENT_TLS_ENABLE: "true"
-      NGINX_AGENT_SERVER_TOKEN: $TOKEN  # Datakey Fron Nginx One Console
-    hostname: basics-oss3
-    container_name: basics-oss3
-    image: docker-registry.nginx.com/nginx/agent:1.26-alpine  # From Docker Public Registry
-    volumes:                    # Sync these folders to container
-        - ./nginx-oss/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
-        - ./nginx-oss/etc/nginx/conf.d:/etc/nginx/conf.d
-        - ./nginx-oss/etc/nginx/includes:/etc/nginx/includes
-        - ./nginx-oss/etc/ssl/nginx:/etc/ssl/nginx
-        - ./nginx-oss/usr/share/nginx/html:/usr/share/nginx/html
+      NGINX_AGENT_SERVER_HOST: 'agent.connect.nginx.com'
+      NGINX_AGENT_SERVER_GRPCPORT: '443'
+      NGINX_AGENT_TLS_ENABLE: 'true'
+      NGINX_AGENT_SERVER_TOKEN: $TOKEN # Datakey Fron Nginx One Console
+    hostname: one-workshop-oss3
+    container_name: one-workshop-oss3
+    image: docker-registry.nginx.com/nginx/agent:1.26-alpine # From Docker Public Registry
+    volumes: # Sync these folders to container
+      - ./nginx-oss/etc/nginx/nginx.conf:/etc/nginx/nginx.conf
+      - ./nginx-oss/etc/nginx/conf.d:/etc/nginx/conf.d
+      - ./nginx-oss/etc/nginx/includes:/etc/nginx/includes
+      - ./nginx-oss/etc/ssl/nginx:/etc/ssl/nginx
+      - ./nginx-oss/usr/share/nginx/html:/usr/share/nginx/html
     ports:
-        - "80"      # Open for HTTP
-        - "443"     # Open for HTTPS
-        - "9000"    # Open for stub status page
-        - "9113"    # Open for Prometheus Scraper page
+      - '80' # Open for HTTP
+      - '443' # Open for HTTPS
+      - '9000' # Open for stub status page
+      - '9113' # Open for Prometheus Scraper page
     restart: always
   #
   web1:
-      hostname: web1
-      container_name: web1
-      platform: linux/amd64
-      image: nginxinc/ingress-demo            # Image from Docker Hub
-      ports:
-        - "80"                                # Open for HTTP
-        - "443"                               # Open for HTTPS
+    hostname: web1
+    container_name: web1
+    platform: linux/amd64
+    image: nginxinc/ingress-demo # Image from Docker Hub
+    ports:
+      - '80' # Open for HTTP
+      - '443' # Open for HTTPS
   web2:
-      hostname: web2
-      container_name: web2
-      platform: linux/amd64
-      image: nginxinc/ingress-demo
-      ports:
-        - "80"
-        - "433"
+    hostname: web2
+    container_name: web2
+    platform: linux/amd64
+    image: nginxinc/ingress-demo
+    ports:
+      - '80'
+      - '433'
   web3:
-      hostname: web3
-      container_name: web3
-      platform: linux/amd64
-      image: nginxinc/ingress-demo
-      ports:
-        - "80"
-        - "443"
+    hostname: web3
+    container_name: web3
+    platform: linux/amd64
+    image: nginxinc/ingress-demo
+    ports:
+      - '80'
+      - '443'
 

labs/lab2/nginx-plus/etc/nginx/conf.d/default.conf

@@ -0,0 +1,64 @@
+server {
+    listen       80 default_server;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        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;
+    }
+
+      location /test_header {
+        add_header X-Test-App true;
+        return 200 'HTTP/1.1 200 OK\nContent-Type: text/html\n\n<html><body>Welcome to Lab 4 of the NGINX One Workshop!</body></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;
+    #}
+
+    # enable /api/ location with appropriate access control in order
+    # to make use of NGINX Plus API
+    #
+    #location /api/ {
+    #    api write=on;
+    #    allow 127.0.0.1;
+    #    deny all;
+    #}
+
+    # enable NGINX Plus Dashboard; requires /api/ location to be
+    # enabled and appropriate access control for remote access
+    #
+    #location = /dashboard.html {
+    #    root /usr/share/nginx/html;
+    #}
+}