Merge branch 'Real-World-Applications-of-Containerized-Development' o…

…f github.com:JohnnieJnr/content into Real-World-Applications-of-Containerized-Development
daytonaio · Dec 8, 2024 · 1532884 · 1532884
2 parents b7e6c15 + b84c900
commit 1532884
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 108 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -3,6 +3,9 @@
 ### Writing Structure
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> b84c90011c85605c006352dce43fa80020f1b029
 
 - [ ] Use short sentences and paragraphs, and include bucket brigades.
 - [ ] Include more than two descriptive H2 headings to organize content.
@@ -56,6 +59,7 @@
 =======
 - [ ] Use the name of the article for the title of the PR.
 >>>>>>> 3b409bd (fixed linting issues and changes some rules)
+<<<<<<< HEAD
 =======
 =======
 
@@ -105,3 +109,5 @@
       grammar tool.
 - [ ] Double-check adherence to the style guide and repository guidelines.
 - [ ] Use the name of the article for the title of the PR.
+=======
+>>>>>>> b84c90011c85605c006352dce43fa80020f1b029
diff --git a/README.md b/README.md
@@ -81,9 +81,16 @@ with pride! For more information, check the
   <img src="https://api.vaunt.dev/v1/github/entities/daytonaio/repositories/content/contributors?format=svg&limit=10" width="600" />
 </p>
 
+<<<<<<< HEAD
+<<<<<<< HEAD
+Happy writing, and thank you for contributing to the Daytona Dotfiles Insider blog!
+=======
+You can showcase your achievement badges on your GitHub profile in the following way:
+=======
 You can showcase your achievement badges on your GitHub profile in the following
 way:
 
+>>>>>>> 3b409bd (fixed linting issues and changes some rules)
 <p>
   <img src="https://api.vaunt.dev/v1/github/entities/nkkko/achievements?format=svg&limit=3" width="400" />
 </p>
@@ -99,5 +106,10 @@ Simply add the following code to your GitHub profile README file:
 </p>
 ```
 
+<<<<<<< HEAD
+Happy writing, and thank you for contributing to the Daytona Dotfiles Insider blog!
+>>>>>>> de0091a (added example)
+=======
 Happy writing, and thank you for contributing to the Daytona Dotfiles Insider
 blog!
+>>>>>>> 3b409bd (fixed linting issues and changes some rules)
diff --git a/articles/YYYYMMDD_article_template.md b/articles/YYYYMMDD_article_template.md
@@ -78,23 +78,7 @@ reader.]_
 <!-- Format: [term](/definitions/term.md) -->
 <<<<<<< HEAD
 <<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<!-- If a definition doesn't exist, create it in the definitions directory and link to it. -->
-=======
-<!-- If a definition doesn't exist, create it in the definitions directory and link to it. -->
->>>>>>> 49d2e46 (fixed merge conflict)
-=======
-<!-- If a definition doesn't exist, create it in the definitions directory and link to it. -->
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
-=======
-<!-- If a definition doesn't exist, create it in the definitions directory and link to it. -->
->>>>>>> 6b0448e (restore deleted files)
-=======
 <!-- If a definition doesn't exist, create it in the definitions directory and link to it. -->
->>>>>>> 4453748 (fixed merge conflict)
 =======
 <!-- If a definition doesn't exist, create it in the definitions directory and link to it. -->
 >>>>>>> 49d2e46 (fixed merge conflict)

diff --git a/articles/assets/20241105_Fly.io_provider_1.1.png b/articles/assets/20241105_Fly.io_provider_1.1.png
diff --git a/articles/assets/20241105_Fly.io_provider_1.png b/articles/assets/20241105_Fly.io_provider_1.png
diff --git a/articles/assets/20241105_Fly.io_provider_2.png b/articles/assets/20241105_Fly.io_provider_2.png
diff --git a/articles/assets/20241105_Fly.io_provider_3.1.png b/articles/assets/20241105_Fly.io_provider_3.1.png
diff --git a/articles/assets/20241105_Fly.io_provider_3.png b/articles/assets/20241105_Fly.io_provider_3.png
diff --git a/articles/assets/20241105_Fly.io_provider_4.png b/articles/assets/20241105_Fly.io_provider_4.png
diff --git a/articles/assets/20241105_Fly.io_provider_5.png b/articles/assets/20241105_Fly.io_provider_5.png
diff --git a/authors/assets/kiran-naragund-company-dark.png b/authors/assets/kiran-naragund-company-dark.png
diff --git a/authors/assets/kiran-naragund-company-white.png b/authors/assets/kiran-naragund-company-white.png
diff --git a/authors/assets/kiran-naragund.jpg b/authors/assets/kiran-naragund.jpg
diff --git a/authors/assets/shivam-chaudhary-logo.png b/authors/assets/shivam-chaudhary-logo.png
diff --git a/authors/assets/shivam-chaudhary.jpg b/authors/assets/shivam-chaudhary.jpg
diff --git a/definitions/20240820_definition_shell_scripting.md b/definitions/20240820_definition_shell_scripting.md
@@ -1,38 +1,22 @@
 ---
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
 title: 'Shell Scripting'
 description:
   'Shell scripting involves writing scripts for a command-line interpreter, such
   as Bash, to automate tasks on Unix-like operating systems. Shell scripts can
   perform a variety of operations, from simple command execution to complex
   workflows involving conditionals and loops.'
-<<<<<<< HEAD
-=======
-title: "Shell Scripting"
-description: "Shell scripting involves writing scripts for a command-line interpreter, such as Bash, to automate tasks on Unix-like operating systems. Shell scripts can perform a variety of operations, from simple command execution to complex workflows involving conditionals and loops."
->>>>>>> 95e8408 (add devcontainer feature guide)
-=======
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
 ---
 
 # Shell Scripting
 
 ## Definition
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
 Shell scripting involves writing scripts for a command-line interpreter, like
 Bash, to automate tasks on Unix-like operating systems. These scripts typically
 consist of a series of commands executed in sequence, often saved in a file with
 a `.sh` extension. Shell scripts can automate repetitive tasks, manage system
 operations, or perform complex workflows, including file manipulation, program
 execution, and text processing.
-<<<<<<< HEAD
 
 Shell scripts are especially useful in development environments for setting up
 and configuring systems. They allow developers to automate processes like
@@ -55,34 +39,3 @@ within Devcontainers. For example, an `install.sh` script might be used to
 install dependencies, configure environments, or set up necessary tools when a
 container is initialized. This automation ensures consistency and efficiency
 across development environments.
-=======
-Shell scripting involves writing scripts for a command-line interpreter, like Bash, to automate tasks on Unix-like operating systems. These scripts typically consist of a series of commands executed in sequence, often saved in a file with a `.sh` extension. Shell scripts can automate repetitive tasks, manage system operations, or perform complex workflows, including file manipulation, program execution, and text processing.
-=======
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
-
-Shell scripts are especially useful in development environments for setting up
-and configuring systems. They allow developers to automate processes like
-installing software, configuring environments, and managing files, making them
-an essential tool for system administrators and developers alike.
-
-### Features
-
-- **Automation:** Shell scripts can automate repetitive tasks, reducing manual
-  effort and the risk of errors.
-- **Flexibility:** They support a wide range of commands, tools, and utilities,
-  allowing for complex operations.
-- **Efficiency:** Shell scripts can quickly perform system tasks, making them
-  ideal for managing server environments and deployment processes.
-
-### Use in Daytona
-
-<<<<<<< HEAD
-In Daytona, shell scripting is used for automating setup and configuration tasks within Devcontainers. For example, an `install.sh` script might be used to install dependencies, configure environments, or set up necessary tools when a container is initialized. This automation ensures consistency and efficiency across development environments.
->>>>>>> 95e8408 (add devcontainer feature guide)
-=======
-In Daytona, shell scripting is used for automating setup and configuration tasks
-within Devcontainers. For example, an `install.sh` script might be used to
-install dependencies, configure environments, or set up necessary tools when a
-container is initialized. This automation ensures consistency and efficiency
-across development environments.
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
diff --git a/definitions/20240820_defintion_python.md b/definitions/20240820_defintion_python.md
@@ -11,16 +11,11 @@ description:
 
 ## Definition
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
 Python is a high-level, interpreted programming language known for its
 readability and ease of use. It was created by Guido van Rossum and first
 released in 1991. Python's syntax emphasizes code readability and simplicity,
 allowing developers to express concepts in fewer lines of code compared to
 languages like C++ or Java.
-<<<<<<< HEAD
 
 Python is widely used in various fields, including web development, data
 science, artificial intelligence, scientific computing, and automation. Its
@@ -44,43 +39,3 @@ making it a go-to language for both beginners and experienced developers.
 In a Devcontainer, Python is frequently used to install packages, manage
 environments, and automate setup processes, making it an essential part of the
 development workflow.
-=======
-Python is a high-level, interpreted programming language known for its readability and ease of use. It was created by Guido van Rossum and first released in 1991. Python's syntax emphasizes code readability and simplicity, allowing developers to express concepts in fewer lines of code compared to languages like C++ or Java.
-=======
->>>>>>> 3b409bd (fixed linting issues and changes some rules)
-
-Python is widely used in various fields, including web development, data
-science, artificial intelligence, scientific computing, and automation. Its
-extensive standard library and vibrant community contribute to its popularity,
-making it a go-to language for both beginners and experienced developers.
-
-### Features
-
-- **Readability:** Python's syntax is designed to be intuitive and clean, making
-  it easier to read and write.
-
-- **Versatility:** Python supports multiple programming paradigms, including
-  procedural, object-oriented, and functional programming.
-
-- **Extensive Libraries:** Python's standard library is rich, and there are many
-  third-party libraries available for a wide range of applications.
-
-- **Community Support:** Python has a large and active community, offering
-  extensive resources for learning and problem-solving.
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-### Use in Daytona:
-
-Python is often used for scripting, automation, and developing applications within the Daytona platform. Its ease of use and powerful libraries make it ideal for tasks such as managing infrastructure, data processing, and integrating with other tools and services.
-
-In a Devcontainer, Python is frequently used to install packages, manage environments, and automate setup processes, making it an essential part of the development workflow.
->>>>>>> 95e8408 (add devcontainer feature guide)
-=======
-In a Devcontainer, Python is frequently used to install packages, manage environments, and automate setup processes, making it an essential part of the development workflow.
->>>>>>> 0fe2061 (add review comments)
-=======
-In a Devcontainer, Python is frequently used to install packages, manage
-environments, and automate setup processes, making it an essential part of the
-development workflow.
->>>>>>> 3b409bd (fixed linting issues and changes some rules)