Difference between revisions of "Moodle, ownCloud, GitLab, MediaWiki, vsCode, NetBeans"

From Rhomicom Wiki
Jump to navigation Jump to search
 
(19 intermediate revisions by the same user not shown)
Line 1: Line 1:
 
== GIT ==
 
== GIT ==
 +
* Install
 +
  sudo dnf install git -y
 +
  git --version
 
* Add Public SSH Key
 
* Add Public SSH Key
   ssh-keygen -t ed25519 -C "RHO_ERP_WEB_KEY"
+
   ssh-keygen -t ed25519 -C "your_email@example.com"
   nano /c/Users/user/.ssh/id_ed25519.pub
+
  eval "$(ssh-agent -s)"
 
+
  ssh-add /path/to/key/id_ed25519
 +
   nano /path/to/key/id_ed25519.pub
 +
* Test SSH Keys
 +
  ssh -T git@github.com # Attempts to ssh to GitHub
 
* Git global setup
 
* Git global setup
 
   git config --global user.name "Allen 123"
 
   git config --global user.name "Allen 123"
   git config --global user.email "allen.123@gmail.com"
+
   git config --global user.email "[[/cdn-cgi/l/email-protection|[email protected]]]"
 
+
  git config --global core.autocrlf input
 
* Create a new repository
 
* Create a new repository
   git clone https://gitlab.rhomicom.com:8443/richard/rho_erp_web.git
+
  git credential-manager clear
 +
   git clone https://gitlab.rhomicom.com/richard/rho_erp_web.git
 
   cd rho_erp_web
 
   cd rho_erp_web
 
   touch README.md
 
   touch README.md
Line 15: Line 22:
 
   git commit -m "add README"
 
   git commit -m "add README"
 
   git push -u origin master
 
   git push -u origin master
 
 
* Push an existing folder
 
* Push an existing folder
 
   cd existing_folder |cd /c/RHO_ERP_WEB
 
   cd existing_folder |cd /c/RHO_ERP_WEB
Line 23: Line 29:
 
   git commit -m "Initial ERP Web commit"
 
   git commit -m "Initial ERP Web commit"
 
   git push -u origin master
 
   git push -u origin master
 
 
* Push an existing Git repository
 
* Push an existing Git repository
 
   cd existing_repo
 
   cd existing_repo
Line 30: Line 35:
 
   git push -u origin --all
 
   git push -u origin --all
 
   git push -u origin --tags
 
   git push -u origin --tags
 
+
* Merge Development Branch into master
 +
  git checkout master
 +
  git merge richard/main
  
 
   git stash
 
   git stash
Line 37: Line 44:
 
   # Next, add the stash back in to your working directory:
 
   # Next, add the stash back in to your working directory:
 
   git stash pop
 
   git stash pop
 +
  # Revert Commits to Previous Commit
 +
  git revert -m 1 c3b57799354139c1b760ce91f3e9d84bc3d72635 # Reverse Merge
 +
  git revert 93b1ad2951ab26170177375ee5ad12184f608ad7 # Reverse Commit
 +
  git commit
 +
  git push origin master
 +
 +
  # This will create three separate revert commits:
 +
  git revert a867b4af 25eee4ca 0766c053
  
 +
  # It also takes ranges. This will revert the last two commits:
 +
  git revert HEAD~2..HEAD
 +
 +
  #Similarly, you can revert a range of commits using commit hashes (non inclusive of first hash):
 +
  git revert 0d1d7fc..a867b4a
 +
 +
  # Reverting a merge commit
 +
  git revert -m 1 <merge_commit_sha>
 +
 +
  # To get just one, you could use `rebase -i` to squash them afterwards
 +
  # Or, you could do it manually (be sure to do this at top level of the repo)
 +
  # get your index and work tree into the desired state, without changing HEAD:
 +
  git checkout 0d1d7fc32 .
 +
 +
  # Then commit. Be sure and write a good message describing what you just did
 +
  git commit
 +
 +
  # Setup folder for git
 
   echo "# mobileapp" >> README.md
 
   echo "# mobileapp" >> README.md
 
   git init
 
   git init
Line 46: Line 79:
 
   git push -u origin main
 
   git push -u origin main
  
 
+
   ssh-keygen -t ed25519 -C "[[/cdn-cgi/l/email-protection|[email protected]]]"
 
 
   ssh-keygen -t ed25519 -C "allen.123@gmail.com"
 
 
   ls -al ~/.ssh
 
   ls -al ~/.ssh
 
   eval `ssh-agent -s`
 
   eval `ssh-agent -s`
 
   ssh-add ~/.ssh/id_ed25519
 
   ssh-add ~/.ssh/id_ed25519
   nano ~/.ssh/id_ed25519
+
   nano ~/.ssh/id_ed25519.pub
  
 +
  git merge --no-ff --no-commit test
 +
  git clone --single-branch --branch <branchname> <remote-repo>
 +
  git clone --single-branch --branch richard/main [[/cdn-cgi/l/email-protection|[email protected]]]:TACMS/erp.git
 +
* COMMIT and MERGE with main branch
 +
  git add .
 +
  git commit -m "Start working on User List"
 +
  git push -u origin richard/main
 +
  git checkout main
 +
  git merge --no-ff --no-commit richard/main
 +
  git commit -m "Start working on User List"
 +
  git push -u origin main
 +
  git checkout richard/main
 +
  git pull origin main
 +
  git push -u origin richard/main
 +
* GIT ALIASES (#)
 +
  git config --global alias.add-commit '!git add -A && git commit'
 +
  git add-commit -m 'My commit message' #On Windows, one should use double-quotes (")
 +
== GITLAB ==
 +
  GRANT ALL ON rho_wiki.* TO 'rho_wikiuser'@'%';
 +
  GRANT CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, ALTER, CREATE, CREATE VIEW, DELETE, DELETE HISTORY, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW,
 +
  TRIGGER, UPDATE, ALTER ROUTINE, EXECUTE ON rho_wiki TO 'rho_wikiuser'@'localhost';
 +
 +
  cat /etc/php/7.4/cli/conf.d/0-upload_large_dumps.ini
 +
  upload_max_filesize = 128M
 +
  post_max_size = 128M
 +
  memory_limit = 1G
 +
  max_execution_time = 600
 +
  max_input_vars = 5000
 +
 +
  find . \( -name "*.gz" -o -name "*.log" -o -name "*.s" -o -name "*.u" \) -exec rm -v {} \;
 +
  find . \( -name "*.gz" -o -name "*.log" -o -name "*.s" -o -name "*.u" \) -delete
 +
  find . \( -name "*.gz" -o -name "*.log" -o -name "*.s" -o -name "*.u" \)
  
   git clone --single-branch --branch <branchname> <remote-repo>
+
   # If the gitlab container fails to start due to permission problems try to fix it by executing:
   git clone --single-branch --branch richard/main git@github.com:TACMS/erp.git
+
  docker exec -it gitlab update-permissions
 +
   docker restart gitlab

Latest revision as of 17:12, 12 August 2023

GIT

  • Install
 sudo dnf install git -y
 git --version
  • Add Public SSH Key
 ssh-keygen -t ed25519 -C "your_email@example.com"
 eval "$(ssh-agent -s)"
 ssh-add /path/to/key/id_ed25519
 nano /path/to/key/id_ed25519.pub
  • Test SSH Keys
 ssh -T git@github.com # Attempts to ssh to GitHub
  • Git global setup
 git config --global user.name "Allen 123"
 git config --global user.email "[email protected]"
 git config --global core.autocrlf input
  • Create a new repository
 git credential-manager clear
 git clone https://gitlab.rhomicom.com/richard/rho_erp_web.git
 cd rho_erp_web
 touch README.md
 git add README.md
 git commit -m "add README"
 git push -u origin master
  • Push an existing folder
 cd existing_folder |cd /c/RHO_ERP_WEB
 git init
 git remote add origin https://gitlab.rhomicom.com:8443/richard/rho_erp_web.git
 git add .
 git commit -m "Initial ERP Web commit"
 git push -u origin master
  • Push an existing Git repository
 cd existing_repo
 git remote rename origin old-origin
 git remote add origin https://gitlab.rhomicom.com:8443/richard/rho_erp_web.git
 git push -u origin --all
 git push -u origin --tags
  • Merge Development Branch into master
 git checkout master
 git merge richard/main
 git stash
 # Then, pull in the changes from origin.
 git fetch origin && git rebase origin/(branch name)
 # Next, add the stash back in to your working directory:
 git stash pop
 # Revert Commits to Previous Commit
 git revert -m 1 c3b57799354139c1b760ce91f3e9d84bc3d72635 # Reverse Merge
 git revert 93b1ad2951ab26170177375ee5ad12184f608ad7 # Reverse Commit
 git commit
 git push origin master
 # This will create three separate revert commits:
 git revert a867b4af 25eee4ca 0766c053
 # It also takes ranges. This will revert the last two commits:
 git revert HEAD~2..HEAD
 #Similarly, you can revert a range of commits using commit hashes (non inclusive of first hash):
 git revert 0d1d7fc..a867b4a
 # Reverting a merge commit
 git revert -m 1 <merge_commit_sha>
 # To get just one, you could use `rebase -i` to squash them afterwards
 # Or, you could do it manually (be sure to do this at top level of the repo)
 # get your index and work tree into the desired state, without changing HEAD:
 git checkout 0d1d7fc32 .
 # Then commit. Be sure and write a good message describing what you just did
 git commit
 # Setup folder for git
 echo "# mobileapp" >> README.md
 git init
 git add README.md
 git commit -m "first commit"
 git branch -M main
 git remote add origin https://github.com/TACMS/mobileapp.git
 git push -u origin main
 ssh-keygen -t ed25519 -C "[email protected]"
 ls -al ~/.ssh
 eval `ssh-agent -s`
 ssh-add ~/.ssh/id_ed25519
 nano ~/.ssh/id_ed25519.pub
 git merge --no-ff --no-commit test
 git clone --single-branch --branch <branchname> <remote-repo>
 git clone --single-branch --branch richard/main [email protected]:TACMS/erp.git
  • COMMIT and MERGE with main branch
 git add .
 git commit -m "Start working on User List"
 git push -u origin richard/main
 git checkout main
 git merge --no-ff --no-commit richard/main
 git commit -m "Start working on User List"
 git push -u origin main
 git checkout richard/main
 git pull origin main
 git push -u origin richard/main
  • GIT ALIASES (#)
 git config --global alias.add-commit '!git add -A && git commit'
 git add-commit -m 'My commit message' #On Windows, one should use double-quotes (")

GITLAB

 GRANT ALL ON rho_wiki.* TO 'rho_wikiuser'@'%';
 GRANT CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, ALTER, CREATE, CREATE VIEW, DELETE, DELETE HISTORY, DROP, INDEX, INSERT, REFERENCES, SELECT, SHOW VIEW, 
 TRIGGER, UPDATE, ALTER ROUTINE, EXECUTE ON rho_wiki TO 'rho_wikiuser'@'localhost';
 cat /etc/php/7.4/cli/conf.d/0-upload_large_dumps.ini
  upload_max_filesize = 128M
  post_max_size = 128M
  memory_limit = 1G
  max_execution_time = 600
  max_input_vars = 5000
 find . \( -name "*.gz" -o -name "*.log" -o -name "*.s" -o -name "*.u" \) -exec rm -v {} \;
 find . \( -name "*.gz" -o -name "*.log" -o -name "*.s" -o -name "*.u" \) -delete
 find . \( -name "*.gz" -o -name "*.log" -o -name "*.s" -o -name "*.u" \)
 # If the gitlab container fails to start due to permission problems try to fix it by executing:
 docker exec -it gitlab update-permissions
 docker restart gitlab