Merge branch 'master' into dependabot/bundler/commonmarker-0.23.7

Author: Adesoji1

.server_client.md.swp

@@ -8,7 +8,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.5)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -243,11 +243,15 @@ GEM
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
-    minitest (5.15.0)
+    minitest (5.17.0)
     multipart-post (2.1.1)
-    nokogiri (1.13.6-arm64-darwin)
+    nokogiri (1.13.9-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.6-x86_64-darwin)
+    nokogiri (1.13.9-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.9-x86_64-linux)
+      racc (~> 1.4)
+    nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
@@ -298,7 +302,7 @@ GEM
     thread_safe (0.3.6)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.11)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
@@ -310,7 +314,7 @@ GEM
       rexml (~> 3.2)
     webrick (1.7.0)
     yell (2.2.2)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   universal-darwin-21

Gemfile.lock

@@ -1,6 +1,5 @@
 # 🏗️ Getting Started with Docker 
 
-![Visitor count](https://shields-io-visitor-counter.herokuapp.com/badge?page=collabnix.dockerlabs)
 ![stars](https://img.shields.io/github/stars/collabnix/dockerlabs)
 ![Discord](https://img.shields.io/discord/1020180904129335379)
 ![GitHub contributors](https://img.shields.io/github/contributors/collabnix/dockerlabs)
@@ -20,9 +19,10 @@
 - [Play with Docker Platform](https://labs.play-with-docker.com/) 
 
 
-# 📝 Join our Slack Community
+# 📝 Join our Community
 
-- Join 7000+ DevOps Engineers today via [Community Slack](https://launchpass.com/collabnix)
+- Join 8700+ DevOps Engineers today via [Community Slack](https://launchpass.com/collabnix)
+- Join 2000+ [Discord members](https://discord.gg/QEkCXAXYSe)
 - Fork, Contribute & Share via [DockerLabs GITHUB Repository](https://github.com/collabnix/dockerlabs)
 -  Click and Follow us over Twitter [![Twitter URL](https://img.shields.io/twitter/url/https/twitter.com/fold_left.svg?style=social&label=Follow%20%40collabnix)](https://twitter.com/collabnix)
 
@@ -39,6 +39,31 @@
 | [Docker Desktop](./workshop/dockerdesktop/README.md) | Docker Dashboard, Dev Environments, Extensions | 5 |
 
 
+
+# Latest Docker Desktop Features and Demos
+
+| Title       | Topics Covered         | Category | Labs |
+|:-------------|:------------------|:------|:------|
+| [Docker Scout](https://github.com/collabnix/docker-scout-community) | Scout CLI, Scout Sample Demo| Security | 2 |
+| [Docker init](https://github.com/dockersamples/docker-init-demos) | Dockerfile, Compose, Python, Go, Rust, Node | Developer Tools | 5|
+| [Docker init for Python](https://github.com/dockersamples/docker-init-demos/tree/main/python) | Dockerfile, Compose, Python | Developer Tools| 1|
+| [Docker init for Go](https://github.com/dockersamples/docker-init-demos/tree/main/go) |Dockerfile, Compose, Go | Developer Tools | 1|
+| [Docker init for Rust](https://github.com/dockersamples/docker-init-demos/tree/main/rust) |Dockerfile, Compose, Rust | Developer Tools | 1|
+| [Compose Watch](https://github.com/dockersamples/docker-init-demos/tree/main/python/compose-watch)| Compose, Sync, Rebuild| Developer Tools | 1 |
+| [Compose Include](https://github.com/ajeetraina/compose-include) | Compose, Include | Developer Tools | 1 |
+
+
+## Industry Use cases
+
+| Title       | Topics Covered         | Labs |
+|:-------------|:------------------|:------|
+| [Docker for AI](https://github.com/collabnix/dockerlabs/tree/master/workshop/ai) | Docker for Data Scientist | 1 |
+| Docker for Gaming | Gaming | Not Started|
+| Docker for Financial Service | - | Not Started|
+| Docker for Healthcare | - | Not Started|
+
+
+
 ## Docker WorkShop for Beginners 
 
 

README.md

@@ -1,5 +1,5 @@
 # Lab #3: Create an image with COPY instruction
-The COPY instruction copies files or directories from source and adds them to the filesystem of the container at destinatio.
+The COPY instruction copies files or directories from source and adds them to the filesystem of the container at destination.
 
 Two form of COPY instruction
 ```

_site/beginners/dockerfile/lab4_dockerfile_copy.md

@@ -52,7 +52,7 @@ def packaging?
 end
 
 # If the deployment is done through Puma, include it in the bundle.
-gem "puma", "~> 4.3.12" if ENV["PORTUS_PUMA_DEPLOYMENT"] == "yes" || !packaging?
+gem "puma", "~> 5.6.7" if ENV["PORTUS_PUMA_DEPLOYMENT"] == "yes" || !packaging?
 
 # In order to create the Gemfile.lock required for packaging
 # meaning that it should contain only the production packages

_site/play-with-docker/Portus/Gemfile

@@ -199,7 +199,7 @@ GEM
     mysql2 (0.3.18)
     nenv (0.3.0)
     net-ldap (0.11)
-    nio4r (2.5.8)
+    nio4r (2.5.9)
     nokogiri (1.13.6)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
@@ -232,7 +232,7 @@ GEM
       activerecord (>= 3.0)
       i18n (>= 0.5.0)
       railties (>= 3.0.0)
-    puma (4.3.12)
+    puma (5.6.7)
       nio4r (~> 2.0)
     pundit (1.0.1)
       activesupport (>= 3.0.0)
@@ -438,7 +438,7 @@ DEPENDENCIES
   poltergeist
   pry-rails
   public_activity
-  puma (~> 4.3.12)
+  puma (~> 5.6.7)
   pundit
   quiet_assets
   rack-mini-profiler

_site/play-with-docker/Portus/Gemfile.lock

@@ -52,7 +52,7 @@ def packaging?
 end
 
 # If the deployment is done through Puma, include it in the bundle.
-gem "puma", "~> 4.3.12" if ENV["PORTUS_PUMA_DEPLOYMENT"] == "yes" || !packaging?
+gem "puma", "~> 5.6.7" if ENV["PORTUS_PUMA_DEPLOYMENT"] == "yes" || !packaging?
 
 # In order to create the Gemfile.lock required for packaging
 # meaning that it should contain only the production packages

_site/play-with-docker/Portus/Portus.1/Gemfile

@@ -83,7 +83,7 @@ GEM
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
     columnize (0.9.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.0)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.6)
@@ -92,12 +92,11 @@ GEM
       activesupport (~> 4.0)
     database_cleaner (1.4.1)
     debug_inspector (0.0.2)
-    devise (3.5.1)
+    devise (4.7.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
+      railties (>= 4.1.0)
       responders
-      thread_safe (~> 0.1)
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
@@ -178,7 +177,7 @@ GEM
     listen (3.0.6)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.10)
@@ -193,16 +192,12 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
     mini_mime (1.1.0)
-    mini_portile2 (2.8.0)
-    minitest (5.14.4)
+
     multi_json (1.11.2)
     multipart-post (2.0.0)
     mysql2 (0.3.18)
     nenv (0.3.0)
     net-ldap (0.11)
-    nio4r (2.5.8)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
     notiffany (0.0.8)
       nenv (~> 0.1)
@@ -233,13 +228,12 @@ GEM
       activerecord (>= 3.0)
       i18n (>= 0.5.0)
       railties (>= 3.0.0)
-    puma (4.3.12)
+    puma (5.6.7)
       nio4r (~> 2.0)
     pundit (1.0.1)
       activesupport (>= 3.0.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    racc (1.6.0)
     rack (1.6.13)
     rack-mini-profiler (0.9.3)
       rack (>= 1.1.3)
@@ -267,22 +261,23 @@ GEM
       activesupport (>= 3.2)
       choice (~> 0.2.0)
       ruby-graphviz (~> 1.2)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.5.0)
+      loofah (~> 2.19, >= 2.19.1)
     rails_stdout_logging (0.0.5)
     railties (4.2.8)
       actionpack (= 4.2.8)
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
-    rake (11.1.2)
+    rake (13.0.6)
     rb-fsevent (0.9.7)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
     redcarpet (3.3.3)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
     rouge (1.11.1)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
@@ -367,15 +362,15 @@ GEM
       polyglot (~> 0.3)
     typhoeus (1.0.2)
       ethon (>= 0.9.0)
-    tzinfo (1.2.9)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unicode-display_width (1.1.0)
     uri_template (0.5.3)
     vcr (3.0.3)
-    warden (1.2.3)
+    warden (1.2.7)
       rack (>= 1.0)
     web-console (2.1.3)
       activemodel (>= 4.0)
@@ -438,7 +433,7 @@ DEPENDENCIES
   poltergeist
   pry-rails
   public_activity
-  puma (~> 4.3.12)
+  puma (~> 5.6.7)
   pundit
   quiet_assets
   rack-mini-profiler

_site/play-with-docker/Portus/Portus.1/Gemfile.lock

@@ -15,7 +15,7 @@
     "webpack-dev-server": "^2.3.0"
   },
   "dependencies": {
-    "bootstrap-sass": "^3.3.6",
+    "bootstrap-sass": "^3.4.1",
     "compression-webpack-plugin": "^0.3.2",
     "jquery": "^3.5.0",
     "jquery-ujs": "^1.2.1",

_site/play-with-docker/Portus/Portus.1/package.json

@@ -660,9 +660,9 @@ boom@2.x.x:
   dependencies:
     hoek "2.x.x"
 
-bootstrap-sass@^3.3.6:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498"
+bootstrap-sass@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.4.1.tgz#6843c73b1c258a0ac5cb2cc6f6f5285b664a8e9a"
 
 brace-expansion@^1.1.7:
   version "1.1.11"