Commit 553219b4 authored by Tony Wildish's avatar Tony Wildish
Browse files

resolve conflicts

parents 03b01a28 e8c2ada2
......@@ -36,43 +36,62 @@ Course guidelines
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 14:40 - 14:50 | 10 min | `EBI Cloud Services <../../_static/pdf/resops2020/EBI_Cloud_Services_v1.0.pdf>`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 14:40 - 15:20 | 40 min | `Porting apps into clouds: 1 <../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds1.pdf>`_ |
| | | `Porting apps into clouds: 2 <../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds2.pdf>`_ |
| | | `Porting apps into clouds: 3 <../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds3.pdf>`_ |
| 05 Oct 2020, 14:40 - 15:20 | 25 min | Porting apps into cloud [ `Part 1`_ | `Part 2`_ | `Part 3`_ ] |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 15:30 - 16:30 | 60 min | `Creating Containers with Docker <../../_static/pdf/resops2020/Creating-Containers-with-Docker.pdf>`_ |
| 05 Oct 2020, 15:30 - 16:30 | 60 min | `Creating Containers with Docker`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 16:30 - 16:40 | 10 min | Break |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 05 Oct 2020, 16:40 - 18:00 | 90 min | `Docker Practicals <Docker.html>`_ |
| 05 Oct 2020, 16:40 - 18:00 | 90 min | `Docker Practicals`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 06 Oct 2020, 14:00 - 15:00 | 60 min | Introduction to Gitlab` |
| | | `(slides) <../../_static/pdf/resops2020/Introduction-to-Gitlab.pdf>`_. |
| 06 Oct 2020, 14:00 - 15:00 | 60 min | `Introduction to Gitlab`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 06 Oct 2020, 15:00 - 16:30 | 90 min | `GitLab Practicals <Gitlab.html>`_ |
| 06 Oct 2020, 15:00 - 16:30 | 90 min | `GitLab Practicals`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 06 Oct 2020, 16:30 - 16:45 | 15 min | `GitLab Auto DevOps <../../_static/pdf/resops2020/Gitlab_Auto-DevOps.pdf>`_ |
| 06 Oct 2020, 16:30 - 16:45 | 15 min | `GitLab Auto DevOps`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 06 Oct 2020, 16:45 - 17:50 | 20 min | GitLab Auto DevOps Demo |
| 06 Oct 2020, 16:45 - 17:50 | 20 min | Demo: GitLab Auto DevOps |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 06 Oct 2020, 17:50 - 18:00 | 10 min | Q/A Session |
| 06 Oct 2020, 17:50 - 18:00 | 10 min | Break |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 14:00 - 15:00 | 60 min | `Kubernetes 101 <../../_static/pdf/resops2019/Kubernetes-101.pdf>`_ |
| 08 Oct 2020, 14:00 - 15:00 | 60 min | `Kubernetes 101`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 15:00 - 17:00 | 120 min | `Overview <../../_static/pdf/resops2020/KubernetesPracticalsDemo.pdf>`_ |
| | | / `Kubernetes (Demo) <Kubernetes-Demo-2019.html>`_ |
| 08 Oct 2020, 15:00 - 17:00 | 02 min | `Overview of Kubernetes (Demo)`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 17:00 - 17:45 | 45 min | `Overview <../../_static/pdf/resops2020/KubernetesPracticals.pdf>`_ |
| | | / `Kubernetes Practical <Minikube-and-NGINX-Practical-2019.html>`_ |
| | 118 min | `Kubernetes (Demo)`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020 | 180 min | `Overview <../../_static/pdf/resops2020/KubernetesAdvancedPracticals.pdf>`_ |
| | | / `Advanced Kubernetes Practical <Scaling-up-Kubernetes.html>`_ |
| 08 Oct 2020, 17:00 - 17:45 | 02 min | `Overview of K8S Practical`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020 | 150 min | `Overview <../../_static/pdf/resops2020/KubernetesAdvancedPracticals.pdf>`_ |
| | | / `Advanced Kubernetes Reading <Important-considerations-for-research-pipelines.html>`_ |
| | 43 min | `Kubernetes Practical`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 17:45 - 17:50 | 05 min | `Overview of Advanced K8S Practical`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| | 177 min | `Advanced Kubernetes Practical`_ [Homework] |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020 | 150 min | `Advanced Kubernetes Reading`_ [Homework] |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
| 08 Oct 2020, 17:50 - 17:55 | 05 min | `Summary`_ |
+-----------------------------+----------+-------------------------------------------------------------------------------------------------------+
.. _Cloud 101: ../../_static/pdf/resops2020/Cloud-101.pdf
.. _EBI Cloud Services: ../../_static/pdf/resops2020/EBI_Cloud_Services_v1.0.pdf
.. _Part 1: ../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds1.pdf
.. _Part 2: ../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds2.pdf
.. _Part 3: ../../_static/pdf/resops2020/PortingResearchPipelinesintoClouds3.pdf
.. _Creating Containers with Docker: ../../_static/pdf/resops2019/Creating-Containers-with-Docker.pdf
.. _Introduction to Gitlab: ../../_static/pdf/resops2019/Introduction-to-Gitlab.pdf
.. _GitLab Auto DevOps: ../../_static/pdf/resops2020/Gitlab_Auto-DevOps.pdf
.. _Kubernetes 101: ../../_static/pdf/resops2020/Kubernetes-101.pdf
.. _Overview of Kubernetes (Demo): ../../_static/pdf/resops2020/KubernetesPracticalsDemo.pdf
.. _Overview of K8S Practical: ../../_static/pdf/resops2020/KubernetesPracticals.pdf
.. _Overview of Advanced K8S Practical: ../../_static/pdf/resops2020/KubernetesAdvancedPracticals.pdf
.. _Summary: ../../_static/pdf/resops2019/Summary.pdf
.. _Docker Practicals: ../2019/Docker.html
.. _GitLab Practicals: ../2019/Gitlab.html
.. _Kubernetes (Demo): ../2019/Kubernetes-Demo-2019.html
.. _Kubernetes Practical: ../2019/Minikube-and-NGINX-Practical-2019.html
.. _Advanced Kubernetes Practical: ../2019/Scaling-up-Kubernetes.html
.. _Advanced Kubernetes Reading: ../2019/Important-considerations-for-research-pipelines.html
.. footer:: These resources are being developed by Cloud Consultants team of EMBL-EBI .
......@@ -27,8 +27,8 @@ ResOps Training
* Please check the course pre-requisite on the agenda page.
* `Agenda for ResOps 2020 <ResOps/2020/Agenda-2020.html>`_
* `Agenda for ResOps 2019 <ResOps/2019/Agenda-2019.html>`_
* `Agenda for ResOps 2020 <ResOps/2019/Agenda-2020.html>`_
Recommended Tools
^^^^^^^^^^^^^^^^^
......@@ -86,9 +86,8 @@ Recommended Tools
* Useful links:
.. * `How to set up Container-as-a-service <Tech-tips/Installing-Docker-Kubernetes-for-CaaS.html>`_
.. * `CaaS Service Description <https://www.ebi.ac.uk/seqdb/confluence/display/CAAS/CaaS+Service+Description>`_
.. * Logstash (ELK):
.. * `CaaS Service Description <https://www.ebi.ac.uk/seqdb/confluence/display/CAAS/CaaS+Service+Description>`_
.. * Logstash (ELK):
* OneData:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment