Skip to content

Commit

Permalink
update (#1)
Browse files Browse the repository at this point in the history
* Added favicon (play-with-docker#229)

* update ubuntu LTS version from 18.04.3 to 20.04.3 in tutorial text (play-with-docker#231)

* Fixed typo (play-with-docker#232)

* typo fixed (play-with-docker#233)

* Fix typo in index.html (play-with-docker#236)

* Update microservice-orchestration/Step6 for live logs. (play-with-docker#238)

Signed-off-by: Travis Hunt <[email protected]>

---------

Signed-off-by: Travis Hunt <[email protected]>
Co-authored-by: Sharan J <[email protected]>
Co-authored-by: Aritra Koley <[email protected]>
Co-authored-by: Sudeep Bhandari <[email protected]>
Co-authored-by: Lev Maximov <[email protected]>
Co-authored-by: Saugat Dhimal <[email protected]>
Co-authored-by: Travis Hunt <[email protected]>
  • Loading branch information
7 people authored Jul 12, 2023
1 parent db24d4e commit 3dba78a
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 4 deletions.
1 change: 1 addition & 0 deletions _includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<meta name="twitter:title" content="{{ page.title | default: 'Play With Docker Classroom' }}" />
<meta name="twitter:description" content="{{ page.description | default: 'Learn docker through online trainings in training.play-with-docker.com' }}" />
<meta name="twitter:image" content="{{ page.img | default: 'https://training.play-with-docker.com/images/simple-logo.png' }}" />
<link rel="shortcut icon" href="{{site.baseurl}}/images/favicon.png">


{% comment %}
Expand Down
4 changes: 2 additions & 2 deletions _posts/2016-10-25-beginner-linux.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ In the next example, we are going to run an Ubuntu Linux container on top of an
2. Run the following commands in the container.
`ls /` will list the contents of the root director in the container, `ps aux` will show running processes in the container, `cat /etc/issue` will show which Linux distro the container is running, in this case Ubuntu 18.04.3 LTS.
`ls /` will list the contents of the root directory in the container, `ps aux` will show running processes in the container, `cat /etc/issue` will show which Linux distro the container is running, in this case Ubuntu 20.04.3 LTS.
```.term1
ls /
Expand Down Expand Up @@ -431,7 +431,7 @@ When you use a bind mount, a file or directory on the host machine is mounted in
$DOCKERID/linux_tweet_app:1.0
```
> Remember from the Dockerfile, `usr/share/nginx/html` is where the html files are stored for the web app.
> Remember from the Dockerfile, `/usr/share/nginx/html` is where the html files are stored for the web app.
2. The [website](/){:data-term=".term1"}{:data-port="80"} should be running.
Expand Down
13 changes: 12 additions & 1 deletion _posts/2018-09-22-microservice-orchestration.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -964,7 +964,6 @@ set :protection, :except=>:path_traversal
redis = Redis.new(url: ENV["REDIS_URL"] || "redis://localhost:6379")

Dir.mkdir("logs") unless Dir.exist?("logs")
cache_log = File.new("logs/extraction.log", "a")

get "/" do
"Usage: http://<hostname>[:<prt>]/api/<url>"
Expand All @@ -980,7 +979,9 @@ get "/api/*" do
redis.set(url, jsonlinks)
end

cache_log = File.open("logs/extraction.log", "a")
cache_log.puts "#{Time.now.to_i}\t#{cache_status}\t#{url}"
cache_log.close

status 200
headers "content-type" => "application/json"
Expand Down Expand Up @@ -1104,6 +1105,16 @@ Now, open the web interface by [clicking the Link Extractor](/){:data-term=".ter
Also, try to repeat these attempts for some URLs.
If everything is alright, the web application should behave as before without noticing any changes in the API service (which is completely replaced).

We can use the `tail` command with the `-f` or `--follow` option to follow the log output live.

```.term1
tail -f logs/extraction.log
```

Try a few more URLs in the web interface. You should see the new log entries appear in the terminal.

To stop following the log, press `Ctrl + C` keys while the interactive terminal is in focus.

We can shut the stack down now:

```.term1
Expand Down
Binary file added images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ <h3 id="ops">Getting Started Walk-through for IT Pros and System Administrators<
<li>Orchestration</li>
</ul><br/>
<li><a href="/ops-stage3">Stage 3: Moving to Production</a></li>
<p><em>This stage will give you the resources to deploy a production application, developer a strategy for integrating Docker into your production environment, and get recognized as a leader in your organization on implementing Docker. Topics include:</em></p>
<p><em>This stage will give you the resources to deploy a production application, develop a strategy for integrating Docker into your production environment, and get recognized as a leader in your organization on implementing Docker. Topics include:</em></p>
<ul>
<li>Reference Implementations</li>
<li>Portability</li>
Expand Down

0 comments on commit 3dba78a

Please sign in to comment.