Skip to content

Commit 423c1a4

Browse files
xs2suruchixs2suruchi
committed
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # OCIWorkVMStack/scripts/installToolkit.sh
2 parents 3099b88 + 47b3f10 commit 423c1a4

File tree

2 files changed

+58
-22
lines changed

2 files changed

+58
-22
lines changed

‎OCIWorkVMStack/scripts/installToolkit.sh

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
#!/bin/bash
22

3+
start=$(date +%s.%N)
34
username=cd3user
4-
sudo mkdir -p /$username/mount_path
5-
logfile="/$username/mount_path/installToolkit.log"
6-
toolkit_dir="/tmp/githubCode"
5+
#sudo mkdir -p /$username/mount_path
6+
sudo mkdir -p /$username/
7+
NOW=$( date '+%F_%H-%M-%S' )
8+
toolkit_dir="/tmp/githubCode_"$NOW
9+
10+
mkdir -p $toolkit_dir
11+
logfile="/tmp/installToolkit.log_"$NOW
712
tenancyconfig_properties="$toolkit_dir/cd3_automation_toolkit/user-scripts/tenancyconfig.properties"
8-
start=$(date +%s.%N)
9-
sudo sh -c "echo '########################################################################' >> /etc/motd"
10-
sudo sh -c "echo ' Welcome to CD3 Automation Toolkit WorkVM' >> /etc/motd"
11-
sudo sh -c "echo '########################################################################' >> /etc/motd"
12-
sudo sh -c "echo 'Please wait for couple of minutes for container to become active if you' >> /etc/motd"
13-
sudo sh -c "echo 'are logging in for first time to after VM Provisioning. Toolkit initial' >> /etc/motd"
14-
sudo sh -c "echo 'setup log is present at - /cd3user/mount_path/installToolkit.log' >> /etc/motd"
15-
sudo sh -c "echo 'To verify podman container run command: sudo podman ps -a' >> /etc/motd"
16-
sudo sh -c "echo 'To connect to container run command: sudo podman exec -it cd3_toolkit bash' >> /etc/motd"
17-
sudo sh -c "echo 'if you want to stop seeing these messages at login remove in /etc/motd' >> /etc/motd"
18-
sudo sh -c "echo '###########################################################################' >> /etc/motd"
13+
1914

2015
stop_exec () {
2116
if [[ $? -ne 0 ]] ; then
@@ -25,6 +20,32 @@ if [[ $? -ne 0 ]] ; then
2520
fi
2621
}
2722

23+
sudo systemctl stop oracle-cloud-agent.service >> $logfile 2>&1
24+
cd /etc/yum.repos.d/
25+
for i in $( ls *.osms-backup ); do sudo mv $i ${i%.*}; done
26+
echo "***SELinux permissive***" >> $logfile 2>&1
27+
sudo setenforce 0
28+
sudo sed -c -i "s/\SELINUX=.*/SELINUX=permissive/" /etc/sysconfig/selinux
29+
30+
echo "***cd3user setup***" >> $logfile 2>&1
31+
sudo useradd -u 1001 $username
32+
sudo sh -c "echo $username ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$username"
33+
sudo chmod 0440 /etc/sudoers.d/$username
34+
sudo chmod 775 -R /$username
35+
sudo chown -R $username:$username /$username
36+
sudo usermod -aG $username opc
37+
sudo mkdir /home/$username/.ssh
38+
sudo chown -R $username:$username /home/$username/.ssh
39+
sudo chmod 700 /home/$username/.ssh
40+
sudo cp /home/opc/.ssh/authorized_keys /home/$username/.ssh/authorized_keys
41+
sudo chown -R $username:$username /home/$username/.ssh/authorized_keys
42+
sudo chmod 600 /home/$username/.ssh/authorized_keys
43+
44+
echo "***Install git***" >> $logfile 2>&1
45+
sudo yum install -y git >> $logfile 2>&1
46+
stop_exec
47+
48+
2849
sudo systemctl stop oracle-cloud-agent.service >> $logfile 2>&1
2950
cd /etc/yum.repos.d/
3051
for i in $( ls *.osms-backup ); do sudo mv $i ${i%.*}; done
@@ -52,7 +73,7 @@ stop_exec
5273

5374
echo "***Install Podman***" >> $logfile 2>&1
5475
echo "########################################################" >> $logfile 2>&1
55-
osrelase=`cat /etc/oracle-release`
76+
osrelease=`cat /etc/oracle-release`
5677
if [[ $osrelase == "Oracle Linux Server release 7".* ]] ; then
5778
sudo yum install -y podman podman-docker >> $logfile 2>&1
5879
stop_exec
@@ -66,10 +87,26 @@ fi
6687
sudo podman --version >> $logfile 2>&1
6788

6889
echo "***Download Toolkit***" >> $logfile 2>&1
69-
sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git $toolkit_dir >> $logfile 2>&1
90+
sudo git clone https://github.com/oracle-devrel/cd3-automation-toolkit.git -b testUpgrade $toolkit_dir
91+
#Get version from release-Notes of code downloaded
92+
version="v2025.1.1"
7093
stop_exec
7194

72-
curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/ -o /tmp/metadata.json
95+
sudo mkdir -p /$username/$version
96+
97+
sudo sh -c "echo '########################################################################' >> /etc/motd"
98+
sudo sh -c "echo ' Welcome to CD3 Automation Toolkit WorkVM' >> /etc/motd"
99+
sudo sh -c "echo '########################################################################' >> /etc/motd"
100+
sudo sh -c "echo 'Please wait for couple of minutes for container to become active if you' >> /etc/motd"
101+
sudo sh -c "echo 'are logging in for first time to after VM Provisioning. Toolkit initial' >> /etc/motd"
102+
sudo sh -c "echo 'setup log is present at - /cd3user/"$version"/installToolkit.log' >> /etc/motd"
103+
sudo sh -c "echo 'To verify podman container run command: sudo podman ps -a' >> /etc/motd"
104+
sudo sh -c "echo 'To connect to container run command: sudo podman exec -it cd3_toolkit bash' >> /etc/motd"
105+
sudo sh -c "echo 'if you want to stop seeing these messages at login remove in /etc/motd' >> /etc/motd"
106+
sudo sh -c "echo '###########################################################################' >> /etc/motd"
107+
108+
109+
sudo curl -H "Authorization: Bearer Oracle" -L http://169.254.169.254/opc/v2/instance/ -o /tmp/metadata.json
73110
metadata=$(cat /tmp/metadata.json)
74111
user_id=$(echo "$metadata" | jq -r '.metadata.current_user_ocid')
75112
cust_name=$(echo "$metadata" | jq -r '.metadata.tenancy_name')
@@ -81,14 +118,13 @@ sudo sed -c -i "s/region=.*/region=$config_region/" $tenancyconfig_properties
81118
sudo sed -c -i "s/user_ocid=.*/user_ocid=$user_id/" $tenancyconfig_properties
82119

83120
echo "***Building container image***" >> $logfile 2>&1
84-
cd /tmp
85-
cd githubCode
121+
cd $toolkit_dir
86122
sudo podman build --platform linux/amd64 -t cd3_toolkit -f Dockerfile --pull --no-cache . >> $logfile 2>&1
87123
stop_exec
88124
sudo podman images >> $logfile 2>&1
89125

90126
echo "***Setting Up podman Container***" >> $logfile 2>&1
91-
sudo podman run --name cd3_toolkit -it -p 8443:8443 -d -v /cd3user/mount_path:/cd3user/tenancies cd3_toolkit bash >> $logfile 2>&1
127+
sudo podman run --name cd3_toolkit -it -p 8443:8443 -d -v /cd3user/$version:/cd3user/tenancies cd3_toolkit bash >> $logfile 2>&1
92128
stop_exec
93129
sudo podman ps -a >> $logfile 2>&1
94130
echo "Connect to Container using command - sudo podman exec -it cd3_toolkit bash " >> $logfile 2>&1

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<br>
99

10-
[What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2024.4.3) &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)
10+
[What's New](https://github.com/oracle-devrel/cd3-automation-toolkit/releases/tag/v2025.1.2) &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)
1111

1212
<br>
1313

@@ -21,7 +21,7 @@ Additionally, the toolkit also supports seamless resource management using OCI D
2121
🚀 Click the below button to quickly launch CD3 toolkit container in Oracle Cloud and start managing your Infra as Code.
2222
<br>
2323

24-
[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/develop.zip)
24+
[![Deploy_To_OCI](https://oci-resourcemanager-plugin.plugins.oci.oraclecloud.com/latest/deploy-to-oracle-cloud.svg)](https://cloud.oracle.com/resourcemanager/stacks/create?zipUrl=https://github.com/oracle-devrel/cd3-automation-toolkit/archive/refs/heads/testUpgrade.zip)
2525

2626
<br>
2727

0 commit comments

Comments
 (0)