diff --git a/day2/03_CI/02_Travis_CI.md b/day2/03_CI/02_Travis_CI.md deleted file mode 100644 index de2953f..0000000 --- a/day2/03_CI/02_Travis_CI.md +++ /dev/null @@ -1,41 +0,0 @@ -!SLIDE smbullets -# Travis CI - -* Cloud based CI system -* Code and unit tests -* Test multiple PHP, Perl, etc. versions at once -* Easy to integrate into GitHub projects - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ - - - -!SLIDE smbullets small -# Travis CI Example - - $ cat .travis.yml - - language: php - - php: - - '7.1' - - branches: - only: - - main - - script: - - php phpunit.phar -c modules/test/phpunit.xml --verbose - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ - diff --git a/day2/03_CI/03_Gitlab_CI.md b/day2/03_CI/03_Gitlab_CI.md index 7e60588..2e90b1a 100644 --- a/day2/03_CI/03_Gitlab_CI.md +++ b/day2/03_CI/03_Gitlab_CI.md @@ -2,6 +2,7 @@ # GitLab CI * Build Pipelines + * Consists of one or more Jobs * Natively integrated into GitLab * Invokes GitLab Runners * Local container registry for runners diff --git a/day2/04_Gitlab_Hints/01_Intro.md b/day2/04_Gitlab_Hints/01_Intro.md deleted file mode 100644 index 9c34531..0000000 --- a/day2/04_Gitlab_Hints/01_Intro.md +++ /dev/null @@ -1,18 +0,0 @@ -!SLIDE subsection -# ~~~SECTION:MAJOR~~~ GitLab Hints - -!SLIDE smbullets -# Issues, Merge Requests, Charts - -* Issues applied to task workflow -* Merge requests with branches "ready to merge" -* Overview charts and boards for better organization -* Your "own" development and operations workflow - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ - diff --git a/day2/04_Gitlab_Hints/03_Administration.md b/day2/04_Gitlab_Hints/03_Administration.md deleted file mode 100644 index 4bd4935..0000000 --- a/day2/04_Gitlab_Hints/03_Administration.md +++ /dev/null @@ -1,88 +0,0 @@ -!SLIDE smbullets -# Administration - -* Default Settings -* Stats, Versions, Users -* Permission Management -* Monitoring, System Hooks -* Appearance and Customizing - -Explore this with the trainer and discuss specific topics. - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ - - -!SLIDE smbullets -# Administration: Appearance and Customization - -Navigate to `Admin > Appearance`. - -* Custom header logo -* Login page text -* New project guidelines - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ - - -!SLIDE smbullets -# Best Practices - -* HTTPS only -* Performance tuning -* Monitoring -* Troubleshooting - - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ - - - - - - -!SLIDE smbullets -# Secure HTTPS environment - -* Use Let's Encrypt or own certificates -* Enable HTTPS in GitLab/Nginx -* Forward all HTTP requests to HTTPS - - -~~~SECTION:handouts~~~ - -Reference: https://docs.gitlab.com/ce/install/installation.html#using-https - -**** - - -~~~ENDSECTION~~~ - -!SLIDE smbullets -# Performance Tuning - -* 4+ GB RAM make GitLab happy -* Move PostgreSQL 9.2+ to a dedicated host - -~~~SECTION:handouts~~~ - - -**** - - -~~~ENDSECTION~~~ - diff --git a/day2/04_Gitlab_Hints/04_Monitoring.md b/day2/04_Gitlab_Hints/04_Monitoring.md deleted file mode 100644 index 2218fb5..0000000 --- a/day2/04_Gitlab_Hints/04_Monitoring.md +++ /dev/null @@ -1,23 +0,0 @@ -!SLIDE smbullets -# Monitoring - -* HTTP(S) -* PostgreSQL -* Redis -* Background daemons -* Logs - -In addition to that, you can query the REST API. - -Example for CI runners: `/api/v4/runners/all` - -~~~SECTION:handouts~~~ - - -**** - -An example for querying the REST API is described in this blogpost: -https://blog.netways.de/2018/09/05/icinga2-gitlab-health-check/ - - -~~~ENDSECTION~~~ diff --git a/day2/04_Gitlab_Hints/06_API.md b/day2/04_Gitlab_Hints/06_API.md deleted file mode 100644 index d785481..0000000 --- a/day2/04_Gitlab_Hints/06_API.md +++ /dev/null @@ -1,21 +0,0 @@ -!SLIDE smbullets -# GitLab API - -* Automation - * Users, Groups, Projects, etc. -* Handle Merge Requests -* Jobs, Pipelines, CI -* ... - -You can manage nearly everything. - -~~~SECTION:handouts~~~ - -**** - -References: https://docs.gitlab.com/ce/api/README.html - -API Ressources: https://docs.gitlab.com/ce/api/api_resources.html - -~~~ENDSECTION~~~ - diff --git a/day2/04_Gitlab_Hints/07_Applications.md b/day2/04_Gitlab_Hints/07_Applications.md deleted file mode 100644 index 1133c95..0000000 --- a/day2/04_Gitlab_Hints/07_Applications.md +++ /dev/null @@ -1,22 +0,0 @@ -!SLIDE smbullets -# GitLab Integrations - -GitLab provides an extensive list of external integrations: - -https://docs.gitlab.com/ce/integration/ - -* CLI clients -* API clients -* GUIs -* ... - -~~~SECTION:handouts~~~ - -**** - -References: https://docs.gitlab.com/ce/api/README.html - -API Ressources: https://docs.gitlab.com/ce/api/api_resources.html - -~~~ENDSECTION~~~ - diff --git a/day2/04_Summary/01_Summary b/day2/04_Summary/01_Summary new file mode 100644 index 0000000..08c53e7 --- /dev/null +++ b/day2/04_Summary/01_Summary @@ -0,0 +1,76 @@ +!SLIDE subsection +# ~~~SECTION:MAJOR~~~ What have we learned? + +!SLIDE smbullets +# The basics topics + +* Cloning or initializing repositories + * `git clone` or `git init` +* Working directory, staging area, commit + * `git add`, `git rm`, `git commit` +* There is no thing as too much `git status` +* Viewing the history + * `git log`, `git show`, `git diff` + +~~~SECTION:handouts~~~ + +**** + + +~~~ENDSECTION~~~ + +!SLIDE smbullets +# The advanced topics + +* Branching + * `git branch`, `git checkout` +* Remote Repositories + * `git push`, `git fetch`, `git pull` +* Merging and resolving conflics + * `git merge` +* Rebasing and squashing + * `git rebase -i ` + +~~~SECTION:handouts~~~ + +**** + + +~~~ENDSECTION~~~ + + +!SLIDE smbullets +# git Best Practices + +* Set user configuration (name, email) +* Try to write good commit messages +* Do not commit all changes at once - use staging with `git add` and then `git commit` +* Work with branches (features, bugfixes, etc.) whenever possible +* Rebase branches prior to creating a merge request +* Always force a merge commit with `--no-ff` to keep history trees in graphs + + +~~~SECTION:handouts~~~ + +**** + + +~~~ENDSECTION~~~ + +!SLIDE smbullets +# Working with GitLab + +* Creating Projects and `git remote` +* Working with Remote Branches + * `git push --force`, `git push origin --delete feature/login` +* Create Milestone and First Issue +* Create Merge Request +* Creating Pipelines with Jobs + * `.gitlab-ci.yml` + +~~~SECTION:handouts~~~ + +**** + + +~~~ENDSECTION~~~ diff --git a/day2/05_Git_Hints/01_Intro.md b/day2/05_Git_Hints/01_Intro.md deleted file mode 100644 index 6fd1673..0000000 --- a/day2/05_Git_Hints/01_Intro.md +++ /dev/null @@ -1,20 +0,0 @@ -!SLIDE subsection -# ~~~SECTION:MAJOR~~~ Git Hints - -!SLIDE smbullets -# Best Practices - -* Set user configuration (name, email) -* Always keep good commits in mind -* Do not commit all changes at once - use staging with `git add` and then `git commit` - -* Work with branches (features, bugfixes, etc.) whenever possible -* Rebase branches against main prior to merging a merge request -* Always force a merge commit with `--no-ff` to keep history trees in graphs - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ diff --git a/day2/05_Git_Hints/02_Hints.md b/day2/05_Git_Hints/02_Hints.md deleted file mode 100644 index 5a2990e..0000000 --- a/day2/05_Git_Hints/02_Hints.md +++ /dev/null @@ -1,13 +0,0 @@ -!SLIDE smbullets -# Hints for details and tests - -* Verbose mode for cli commands: `-v` -* Test-drive but don't change anything: `--dry-run` - - -~~~SECTION:handouts~~~ - -**** - - -~~~ENDSECTION~~~ diff --git a/day2/04_Gitlab_Hints/02_UI.md b/day2/05_Outlook/01_GitLab_Features.md similarity index 50% rename from day2/04_Gitlab_Hints/02_UI.md rename to day2/05_Outlook/01_GitLab_Features.md index 7446f8d..8771d38 100644 --- a/day2/04_Gitlab_Hints/02_UI.md +++ b/day2/05_Outlook/01_GitLab_Features.md @@ -1,3 +1,6 @@ +!SLIDE subsection +# ~~~SECTION:MAJOR~~~ Further GitLab Features + !SLIDE smbullets # Issue Boards @@ -59,74 +62,6 @@ Follow the instructions and ask the trainer for help in case. -!SLIDE smbullets -# Web IDE - -* Write code in the browser -* Commit changes - * Which triggers CI pipelines to provide immediate feedback -* Syntax highlighting -* Auto-completion -* Under heavy development, use 11.2+ - -~~~SECTION:handouts~~~ - -**** - -https://about.gitlab.com/2018/06/15/introducing-gitlab-s-integrated-development-environment/ -https://blog.netways.de/2018/06/28/a-peek-into-gitlab-11-the-web-ide-and-auto-devops-with-kubernetes/ - - -~~~ENDSECTION~~~ - - -!SLIDE smbullets -# Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Update README.md with the Web IDE - -* Objective: - * Use the Web IDE to write documentation and verify CI results -* Steps: - * Navigate to `Repository > Files` and click `Web IDE` - * Select `README.md` from the tree - * Edit the file, use the live preview - * Commit the changes, select `Commit to main branch` - * Select the rocket icon on the right, check the pipeline status - - -~~~SECTION:handouts~~~ - -**** - -~~~ENDSECTION~~~ - -!SLIDE supplemental exercises -# Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Update README.md with the Web IDE - -## Update README.md with the Web IDE -**** - -* Use the Web IDE to write documentation and verify CI results - -## Steps: - -* Navigate to `Repository > Files` and click `Web IDE` -* Select `README.md` from the tree -* Edit the file, use the live preview -* Commit the changes, select `Commit to main branch` -* Select the rocket icon on the right, check the pipeline status - -!SLIDE supplemental solutions -# Lab ~~~SECTION:MAJOR~~~.~~~SECTION:MINOR~~~: Proposed Solution -**** - -## Update README.md with the Web IDE - -**** - -Follow the instructions and ask the trainer for help in case. - - - !SLIDE smbullets # Project Snippets @@ -160,10 +95,12 @@ https://docs.gitlab.com/ce/user/project/wiki/ ~~~ENDSECTION~~~ !SLIDE smbullets -# Project Graph +# Container and Package Registry -* History lines in a graph -* Similar to tig and GUI clients +* Every GitLab project can have its own space to store its Docker images +* Image naming convention: `///` + * `git.example.com/mynamespace/myproject:some-tag` +* Package registry for a variety of supported package managers (npm, pypi, Ruby gems, etc.) ~~~SECTION:handouts~~~ @@ -171,4 +108,3 @@ https://docs.gitlab.com/ce/user/project/wiki/ ~~~ENDSECTION~~~ - diff --git a/day2/05_Git_Hints/03_Debugging.md b/day2/05_Outlook/03_Debugging.md similarity index 95% rename from day2/05_Git_Hints/03_Debugging.md rename to day2/05_Outlook/03_Debugging.md index 0fad317..9d20930 100644 --- a/day2/05_Git_Hints/03_Debugging.md +++ b/day2/05_Outlook/03_Debugging.md @@ -1,3 +1,7 @@ +!SLIDE subsection +# ~~~SECTION:MAJOR~~~ Further Git Features + + !SLIDE smbullets # Debugging diff --git a/day2/05_Git_Hints/04_Restore.md b/day2/05_Outlook/04_Restore.md similarity index 100% rename from day2/05_Git_Hints/04_Restore.md rename to day2/05_Outlook/04_Restore.md diff --git a/day2/05_Git_Hints/05_Apply_Create_Patches.md b/day2/05_Outlook/05_Apply_Create_Patches.md similarity index 100% rename from day2/05_Git_Hints/05_Apply_Create_Patches.md rename to day2/05_Outlook/05_Apply_Create_Patches.md diff --git a/day2/05_Git_Hints/10_Submodules.md b/day2/05_Outlook/10_Submodules.md similarity index 100% rename from day2/05_Git_Hints/10_Submodules.md rename to day2/05_Outlook/10_Submodules.md diff --git a/day2/05_Git_Hints/11_Subtree.md b/day2/05_Outlook/11_Subtree.md similarity index 100% rename from day2/05_Git_Hints/11_Subtree.md rename to day2/05_Outlook/11_Subtree.md diff --git a/day2/05_Git_Hints/20_Aliases.md b/day2/05_Outlook/20_Aliases.md similarity index 100% rename from day2/05_Git_Hints/20_Aliases.md rename to day2/05_Outlook/20_Aliases.md diff --git a/day2/05_Git_Hints/30_Attributes.md b/day2/05_Outlook/30_Attributes.md similarity index 100% rename from day2/05_Git_Hints/30_Attributes.md rename to day2/05_Outlook/30_Attributes.md diff --git a/day2/05_Git_Hints/31_LFS.md b/day2/05_Outlook/31_LFS.md similarity index 100% rename from day2/05_Git_Hints/31_LFS.md rename to day2/05_Outlook/31_LFS.md diff --git a/day2/05_Git_Hints/40_Svn_Migration.md b/day2/05_Outlook/40_Svn_Migration.md similarity index 100% rename from day2/05_Git_Hints/40_Svn_Migration.md rename to day2/05_Outlook/40_Svn_Migration.md diff --git a/showoff.json b/showoff.json index f8bed49..18af676 100644 --- a/showoff.json +++ b/showoff.json @@ -35,8 +35,8 @@ {"section":"day2/01_Workflows"}, {"section":"day2/02_Integrations"}, {"section":"day2/03_CI"}, - {"section":"day2/04_Gitlab_Hints"}, - {"section":"day2/05_Git_Hints"}, + {"section":"day2/04_Summary"}, + {"section":"day2/05_Outlook"}, {"section": "global/post"} ]