Skip to content

Commit e82e60f

Browse files
authored
Merge pull request #9 from ibm-cloud-architecture/bck-updates
Bck updates
2 parents 5cf699c + 2172dc5 commit e82e60f

File tree

4 files changed

+127
-114
lines changed

4 files changed

+127
-114
lines changed

docs/cloud-native/app-dev.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -82,18 +82,18 @@ If you keep deploying new services without cleaning up the old ones which are in
8282

8383
## Twelve factor design methodology
8484

85-
- *Code base* - One code base tracked in revision control, many deploys.
86-
- *Dependencies* - Explicitly declare and isolate dependencies.
87-
- *Config* - Store config in the environment.
88-
- *Backing services* - Treat backing services as attached resources.
89-
- *Build, release, run* - Strictly separate build and run stages.
90-
- *Processes* - Execute the app as one (or more) stateless process(es).
91-
- *Port binding* - Export services through port binding.
92-
- *Concurrency* - Scale-out through the process model.
93-
- *Disposability* - Maximize robustness with fast startup and graceful shutdown.
94-
- *Dev/prod parity* - Keep development, staging, and production as similar as possible.
95-
- *Logs* - Treat logs as event streams.
96-
- *Admin processes* - Run admin/management tasks as one-off processes.
85+
- _Code base_ - One code base tracked in revision control, many deploys.
86+
- _Dependencies_ - Explicitly declare and isolate dependencies.
87+
- _Config_ - Store config in the environment.
88+
- _Backing services_ - Treat backing services as attached resources.
89+
- _Build, release, run_ - Strictly separate build and run stages.
90+
- _Processes_ - Execute the app as one (or more) stateless process(es).
91+
- _Port binding_ - Export services through port binding.
92+
- _Concurrency_ - Scale-out through the process model.
93+
- _Disposability_ - Maximize robustness with fast startup and graceful shutdown.
94+
- _Dev/prod parity_ - Keep development, staging, and production as similar as possible.
95+
- _Logs_ - Treat logs as event streams.
96+
- _Admin processes_ - Run admin/management tasks as one-off processes.
9797

9898
<iframe width="560" height="315" src="https://www.youtube.com/embed/jufe_sHejXc" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
9999

@@ -151,6 +151,6 @@ We discussed the cloud-native application design, implementations of cloud nativ
151151

152152
## References
153153

154-
- https://learning.oreilly.com/library/view/managing-cloud-native/9781492037071/[Justin Garrison, Kris Nova, (2018). Managing cloud native applications. Publisher: O'Reilly Media, Inc.]
155-
- https://learning.oreilly.com/library/view/cloud-native-architectures/9781787280540/[Piyum Zonooz, Erik Farr, Kamal Arora, Tom Laszewski, (2018). Cloud Native Architectures. Publisher: Packt Publishing]
156-
- https://12factor.net/codebase[12factor.net]
154+
- [Justin Garrison, Kris Nova, (2018). Managing cloud native applications. Publisher: O'Reilly Media, Inc.](https://learning.oreilly.com/library/view/managing-cloud-native/9781492037071)
155+
- [Piyum Zonooz, Erik Farr, Kamal Arora, Tom Laszewski, (2018). Cloud Native Architectures. Publisher: Packt Publishing](https://learning.oreilly.com/library/view/cloud-native-architectures/9781787280540)
156+
- [12factor.net](https://12factor.net/codebase)

docs/containers/index.md

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ There are many different container standards available today. Some of them are a
4040

4141
Among them, Docker was one of the most popular mainstream container software tools.
4242

43-
***Open Container Initiative (OCI)***
43+
!!! info "Open Container Initiative (OCI)"
4444

45-
A Linux Foundation project developing a governed container standard. Docker and Rocket are OCI-compliant. But, Garden is not.
45+
A Linux Foundation project developing a governed container standard. **Docker** and **Rocket** are OCI-compliant. But, **Garden** is not.
4646

4747
## Benefits
4848

@@ -52,10 +52,12 @@ A Linux Foundation project developing a governed container standard. Docker and
5252
- Portable
5353
- Supports agile development
5454

55-
To know more about Containerization, we have couple of guides. Feel free to check them out.
55+
???+ note "Containerization Guides"
5656

57-
- [Containerization: A Complete Guide](https://www.ibm.com/cloud/learn/containerization).
58-
- [Containers: A Complete Guide](https://www.ibm.com/cloud/learn/containers).
57+
To know more about Containerization, we have couple of guides. Feel free to check them out.
58+
59+
- [Containerization: A Complete Guide](https://www.ibm.com/cloud/learn/containerization).
60+
- [Containers: A Complete Guide](https://www.ibm.com/cloud/learn/containers).
5961

6062
## Docker
6163

@@ -81,28 +83,37 @@ These images are build from the `Dockerfile`.
8183
- It specifies the operating system.
8284
- It also includes things like environmental variables, ports, file locations etc.
8385

84-
If you want to try building docker images, try this course on [O'Reilly](https://learning.oreilly.com/videos/docker-for-the/9781788991315/) (Interactive Learning Platform).
86+
???+ note "Interactive Learning"
87+
88+
If you want to try building docker images, try this course on [O'Reilly](https://learning.oreilly.com/videos/docker-for-the/9781788991315/){target="_blank"} (Interactive Learning Platform).
8589

86-
- [Building Container Images](https://learning.oreilly.com/videos/docker-for-the/9781788991315/9781788991315-video4_2/) - Estimated Time: 12 minutes.
90+
- [Building Container Images](https://learning.oreilly.com/videos/docker-for-the/9781788991315/9781788991315-video4_2/){target="_blank"} - Estimated Time: 12 minutes.
8791

8892
### Docker Container
8993

9094
The standard unit where the application service is located or transported. It packages up all code and its dependencies so that the application runs quickly and reliably from one computing environment to another.
9195

92-
If you want to try deploying a docker container, try this course on [O'Reilly](https://learning.oreilly.com/videos/docker-for-the/9781788991315/9781788991315-video4_2/#t11m27s) (Interactive Learning Platform).
96+
???+ note "Interactive Learning"
97+
98+
If you want to try deploying a docker container, try this course on [O'Reilly](https://learning.oreilly.com/videos/docker-for-the/9781788991315/){target="_blank"} (Interactive Learning Platform).
99+
100+
- [Deploying a Docker Container](https://learning.oreilly.com/videos/docker-for-the/9781788991315/9781788991315-video4_2/#t11m27s){target="_blank"}
93101

94102
### Docker Engine
95103

96104
Docker Engine is a program that creates, ships, and runs application containers. The engine runs on any physical or virtual machine or server locally, in private or public cloud. The client communicates with the engine to run commands.
97105

98-
If you want to learn more about docker engines, try this course on [O'Reilly](https://learning.oreilly.com/videos/docker-for-the/9781788991315/9781788991315-video7_1/)
106+
???+ note "Interactive Learning"
107+
108+
If you want to learn more about docker engines, try this course on [O'Reilly](https://learning.oreilly.com/videos/docker-for-the/9781788991315/){target="_blank"} (Interactive Learning Platform).
109+
110+
- [Docker Networking](https://learning.oreilly.com/videos/docker-for-the/9781788991315/9781788991315-video7_1/){target="\_blank"}
99111

100112
### Docker Registry
101113

102114
The registry stores, distributes, and shares container images. It is available in software as a service (SaaS) or in an enterprise to deploy anywhere you that you choose.
103115

104-
**Docker Hub** is a popular registry. It is a registry which allows you to download docker images which are built by different communities. You can also store your own images there. You can check out various images available on docker hub [here](https://hub.docker.com/search?q=&type=image).
105-
116+
**Docker Hub** is a popular registry. It is a registry which allows you to download docker images which are built by different communities. You can also store your own images there. You can check out various images available on docker hub [here](https://hub.docker.com/search?q=&type=image){target="\_blank"}.
106117

107118
<iframe width="640" height="480" src="https://www.youtube.com/embed/CPJLKqvR8II" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
108119

docs/containers/reference.md

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ For example, Docker created standard way to create images for Linux Containers.
1212
| Run `hello-world` Container | `docker run hello-world` |
1313
| List Running Containers | `docker ps` |
1414
| Stop a container | `docker stop <container-name/container-id>` |
15-
| List Docker Images | `docker images` |
15+
| List Docker Images | `docker images` |
1616
| Login into registry | `docker login` |
1717
| Build an image | `docker build -t <image_name>:<tag> .` |
18-
| Inspect a docker object | `docker inspect <name/id>` |
19-
| Inspect a docker image | `docker inspect image <name/id>` |
20-
| Pull an image | `docker pull <image_name>:<tag>` |
21-
| Push an Image | `docker push <image_name>:<tag>` |
22-
| Remove a container | `docker rm <container-name/container-id>` |
18+
| Inspect a docker object | `docker inspect <name/id>` |
19+
| Inspect a docker image | `docker inspect image <name/id>` |
20+
| Pull an image | `docker pull <image_name>:<tag>` |
21+
| Push an Image | `docker push <image_name>:<tag>` |
22+
| Remove a container | `docker rm <container-name/container-id>` |
2323

2424
## Running Docker
2525

@@ -50,6 +50,7 @@ For example, Docker created standard way to create images for Linux Containers.
5050
``` bash
5151
ibmcloud cr login --client docker
5252
```
53+
5354
<!---
5455
=== "Docker on Kubernetes/OpenShift"
5556
@@ -74,7 +75,7 @@ For example, Docker created standard way to create images for Linux Containers.
7475
``` bash
7576
docker version
7677
```
77-
78+
7879
=== "Kubernetes"
7980
8081
1. If you have already configured your Kubernetes, skip to step 5. First, add a user by setting credentials. Feel free to change the credential name, username and password to whatever you like.
@@ -112,11 +113,12 @@ For example, Docker created standard way to create images for Linux Containers.
112113
docker version
113114
```
114115
--->
116+
115117
## Activities
116118

117-
| Task | Description | Link | Time |
118-
| ----------------------- | --------------------------------------------------------------- | :--------------------------------------------------------------------------------------------------------------------------- | ------ | | | |
119-
| IBM Container Registry | Build and Deploy Run using IBM Container Registry | [IBM Container Registry](../labs/containers/container-registry/index.md) | 30 min |
120-
| Docker Lab | Running a Sample Application on Docker | [Docker Lab](../labs/containers/index.md) | 30 min |
119+
| Task | Description | Link | Time |
120+
| ---------------------- | ------------------------------------------------- | ------------------------------------------------------------------------ | ------ |
121+
| IBM Container Registry | Build and Deploy Run using IBM Container Registry | [IBM Container Registry](../labs/containers/container-registry/index.md) | 30 min |
122+
| Docker Lab | Running a Sample Application on Docker | [Docker Lab](../labs/containers/index.md) | 30 min |
121123

122124
Once you have completed these tasks, you should have a base understanding of containers and how to use Docker.

0 commit comments

Comments
 (0)