Merge pull request #150 from oracle-devrel/develop

Automation toolkit Release v2025.2.0

Author: xs2suruchi

Dockerfile

@@ -16,12 +16,12 @@ ARG USER_GID=$USER_UID
 # Whether to download Provider as part of image creation
 ARG DOWNLOAD_PROVIDER=NO
 # TF Provider version
-ARG TF_OCI_PROVIDER=7.8.0
+ARG TF_OCI_PROVIDER=7.19.0
 ARG TF_NULL_PROVIDER=3.2.3
 
 RUN microdnf install -y sudo && \
     groupadd --gid $USER_GID $USERNAME && \
-    useradd --uid $USER_UID --gid $USER_GID -d /$USERNAME -m $USERNAME && \
+    useradd --uid $USER_UID --gid $USER_GID  $USERNAME && \
     echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \
     chmod 0440 /etc/sudoers.d/$USERNAME && \
     mkdir -p /cd3user/tenancies && \

OCIWorkVMStack/scripts/installToolkit.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
 username=cd3user
-sudo mkdir -p /$username/mount_path
 logfile="/$username/mount_path/installToolkit.log"
 toolkit_dir="/tmp/githubCode"
-tenancyconfig_properties="$toolkit_dir/cd3_automation_toolkit/user-scripts/tenancyconfig.properties"
+mount_dir="/$username/mount_path"
+sudo mkdir -p /$mount_dir/tenancies
+sudo mkdir -p /$mount_dir/oci_tools
+
+tenancyconfig_properties="/$mount_dir/oci_tools/cd3_automation_toolkit/user-scripts/tenancyconfig.properties"
 start=$(date +%s.%N)
 sudo sh -c "echo '########################################################################' >> /etc/motd"
 sudo sh -c "echo '                 Welcome to CD3 Automation Toolkit WorkVM' >> /etc/motd"
@@ -66,7 +69,10 @@ fi
 sudo podman --version >> $logfile 2>&1 || true
 
 echo "***Download Toolkit***" >> $logfile 2>&1
-sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git $toolkit_dir >> $logfile 2>&1
+sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b develop $toolkit_dir >> $logfile 2>&1
+cp -r $toolkit_dir/cd3_automation_toolkit /$mount_dir/oci_tools/
+cp -r $toolkit_dir/othertools /$mount_dir/oci_tools/
+sudo chown -R $username:$username /$mount_dir/oci_tools/
 stop_exec
 
 curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/ -o /tmp/metadata.json
@@ -88,7 +94,7 @@ stop_exec
 sudo podman images >> $logfile 2>&1
 
 echo "***Setting Up podman Container***" >> $logfile 2>&1
-sudo podman run --name cd3_toolkit -it -p 8443:8443 -d -v /cd3user/mount_path:/cd3user/tenancies  cd3_toolkit bash >> $logfile 2>&1
+sudo podman run --name cd3_toolkit -it -p 8443:8443 -d -v /cd3user/mount_path:/cd3user  cd3_toolkit bash >> $logfile 2>&1
 stop_exec
 sudo podman ps -a >> $logfile 2>&1
 echo "Connect to Container using command - sudo podman exec -it cd3_toolkit bash " >> $logfile 2>&1
@@ -99,4 +105,4 @@ duration_sec=$(echo "$(date +%s.%N) - $start" | bc)
 duration_min=$(echo "$duration_sec%3600/60" | bc)
 execution_time=`printf "%.2f seconds" $duration_sec`
 echo "Script Execution Time in Seconds: $execution_time" >> $logfile 2>&1
-echo "Script Execution Time in Minutes: approx $duration_min Minutes" >> $logfile 2>&1
+echo "Script Execution Time in Minutes: approx $duration_min Minutes" >> $logfile 2>&1

README.md

@@ -7,7 +7,7 @@
 
 <br>
 
-  [What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2025.1.4) &nbsp;•&nbsp;[Excel Templates](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/excel-templates/) &nbsp;•&nbsp;[CD3 Docs](https://oracle-devrel.github.io/cd3-automation-toolkit/)&nbsp;•&nbsp; [Watch & Learn](https://www.youtube.com/playlist?list=PLPIzp-E1msrbJ3WawXVhzimQnLw5iafcp) &nbsp;•&nbsp;[Blogs & Tutorials](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/tutorials/) &nbsp;•&nbsp;[Livelabs](https://apexapps.oracle.com/pls/apex/f?p=133:180:112501098061930::::wid:3724) &nbsp;•&nbsp;[Slack Channel](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/queries) 
+  [What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2025.2.0) &nbsp;•&nbsp;[Excel Templates](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/excel-templates/) &nbsp;•&nbsp;[CD3 Docs](https://oracle-devrel.github.io/cd3-automation-toolkit/)&nbsp;•&nbsp; [Watch & Learn](https://www.youtube.com/playlist?list=PLPIzp-E1msrbJ3WawXVhzimQnLw5iafcp) &nbsp;•&nbsp;[Blogs & Tutorials](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/tutorials/) &nbsp;•&nbsp;[Livelabs](https://apexapps.oracle.com/pls/apex/f?p=133:180:112501098061930::::wid:3724) &nbsp;•&nbsp;[Slack Channel](https://oracle-devrel.github.io/cd3-automation-toolkit/latest/queries) 
 
 <br>
 
@@ -39,16 +39,15 @@ Additionally, the toolkit also supports seamless resource management using OCI D
     <td>DNS Management</td>
     <td>Load Balancers</td>
   </tr>
-  <tr>
-    <td>OCI Network Firewall</td>
-    <td>KMS</td>
-    <td>Policy Enforcement using OPA</td>
-    
-  </tr>
   <tr>
     <td>Compute</td>
     <td>Storage</td>
-    <td>Database</td>    
+    <td>Oracle, MySQL Databases</td>    
+  </tr>
+    <tr>
+    <td>OCI Network Firewall</td>
+    <td>KMS</td>
+    <td>Policy Enforcement using OPA</td>  
   </tr>
   <tr>
     <td>OKE</td>
@@ -63,15 +62,14 @@ Additionally, the toolkit also supports seamless resource management using OCI D
   <tr>    
     <td>Cloud Guard</td>
     <td>SHOWOCI report</td>    
-    <td>CIS Landing Zone<br>Compliance</td>
-    
+    <td>CIS Compliance Report</td> 
   </tr>
 </table>
 </tr>
-
-
 </body>
 
+📌 The Toolkit also extends its support to <b>ADB@Azure</b>
+
 <br>
 
 ## Why CD3?