From 4abd99427ce01bf62410520a40d926414ffc1e90 Mon Sep 17 00:00:00 2001 From: Aso Date: Mon, 1 Dec 2025 15:05:31 +0300 Subject: [PATCH 1/2] output style has been improved. --- README.md | 60 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index c05eec0..55ccb7f 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,35 @@ -# Welcome to DevOpsCon CI/CD demo repo -## This repository contains basic Maven project with Hello-World Java war for CI/CD workshop -In order to make it work, please follow the instructions below: - -> [!IMPORTANT] -> Make sure you have JAVA 21 (JDK and not JRE standalone) running on your laptop - - - - > ```xml - > - > - > - > - > - > - > ``` - +# 🌟 Welcome to DevOpsCon CI/CD Demo Repo + +This repository contains a basic **Maven project** with a **Hello-World Java WAR** file used during the **CI/CD workshop**. + +Please follow the setup instructions below to get everything running correctly. + +--- + +> ⚠️ **IMPORTANT** +> Make sure you have **JAVA 21 (JDK — *not* JRE standalone)** installed on your machine. +> —————————————————————————— + +--- + +## 🚀 Setup Instructions + +### 1️⃣ Download & Prepare Tomcat +- Download **Tomcat 9** (not version 10). + Choose: **Core → ZIP** + 👉 Tomcat 9 Download Page + +--- + +### 2️⃣ Add User Configuration +Edit: +`/conf/tomcat-users.xml` +Insert the following: + +```xml + + + + + + From f22304af21157fcdfe635fdd87fdb35e94ea3338 Mon Sep 17 00:00:00 2001 From: Aso Date: Mon, 1 Dec 2025 15:13:33 +0300 Subject: [PATCH 2/2] Output style has been improved. --- README.md | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 55ccb7f..2fd147e 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,29 @@ -# 🌟 Welcome to DevOpsCon CI/CD Demo Repo +# 🌟 Welcome to DevOpsCon CI/CD demo repo -This repository contains a basic **Maven project** with a **Hello-World Java WAR** file used during the **CI/CD workshop**. +## This repository contains basic Maven project with Hello-World Java war for CI/CD workshop -Please follow the setup instructions below to get everything running correctly. +In order to make it work, please follow the instructions below: ---- - -> ⚠️ **IMPORTANT** -> Make sure you have **JAVA 21 (JDK — *not* JRE standalone)** installed on your machine. -> —————————————————————————— +> [!IMPORTANT] +> Make sure you have JAVA 21 (**JDK** and not **JRE standalone**) running on your laptop +> ———————————————————————— --- -## 🚀 Setup Instructions +### ⚙️ Setup Instructions -### 1️⃣ Download & Prepare Tomcat -- Download **Tomcat 9** (not version 10). - Choose: **Core → ZIP** - 👉 Tomcat 9 Download Page +
    +
  • Get Tomcat 9 (not version 10) - prefer the Core > Zip from here
    • +
  • Configure under <TOMCAT DIR>/conf/tomcat-users.xml the code below
    • +
  • [LINUX / MAC] Please make sure you have running permissions on the /bin/ directory and run chmod +x *.sh
    • +
  • Restart tomcat [TOMCAT DIR]/bin/shutdown.sh & startup.sh (for non-Windows OS) or /bin/shutdown.bat & startup.bat
    • +
  • The Tomcat URL is http://localhost:8080/
    • +
  • The application URL is http://localhost:8080/helloworld/
    • +
--- -### 2️⃣ Add User Configuration -Edit: -`/conf/tomcat-users.xml` -Insert the following: +### 📝 XML Configuration ```xml @@ -32,4 +31,4 @@ Insert the following: - + \ No newline at end of file