-
Notifications
You must be signed in to change notification settings - Fork 12
Exercises lesson5 - Cesar #26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
cesarsantiagonunez
wants to merge
6
commits into
hectorcanto:main
Choose a base branch
from
cesarsantiagonunez:exercises_lesson5
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
88fa79f
Dockerfile.ex1 solution
cesarsantiagonunez 901234b
ex1_solution
cesarsantiagonunez 3c367fb
Merge pull request #1 from hectorcanto/main
cesarsantiagonunez 4298dae
Dockerfile.ex2 proposal
cesarsantiagonunez 8a18154
corrected format
cesarsantiagonunez 0018afb
corrected format
cesarsantiagonunez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,9 @@ | ||
| FROM | ||
|
|
||
| LABEL | ||
| ENV | ||
| EXPOSE | ||
|
|
||
| ADD | ||
| COPY | ||
| RUN | ||
|
|
||
| FROM nginx:1.22.1 | ||
|
|
||
| LABEL author=CMSN | ||
| ENV LESSON_NUMBER=5 | ||
| EXPOSE 80 | ||
|
|
||
| RUN mv /etc/nginx/nginx.conf /etc/nginx/default.conf | ||
| COPY ex1.conf /etc/nginx/nginx.conf | ||
| COPY ex1_web.html /var/www/index.html | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,11 @@ | ||
| ### Port 80 content | ||
| Welcome to nginx! | ||
| If you see this page, the nginx web server is successfully installed and working. Further configuration is required. | ||
|
|
||
| For online documentation and support please refer to nginx.org. | ||
| Commercial support is available at nginx.com. | ||
|
|
||
| #### Port 8888 content | ||
| Thank you for using nginx. | ||
|
|
||
| #### Port 8888 content | ||
| Docker course lesson 5 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,3 +11,6 @@ Edit the Dockerfile and/or write below your thoughts. Open a pull request with y | |
|
|
||
| ### Your changes | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Poderîas ter engadido máis cousas:
|
||
|
|
||
| - Combine lines 4 and 5 | ||
| - Replace line 8 with **ADD hello.zip** | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Diría que COPY e ADD ocupan o mesmo, non? eu diría de facer o unzip fora, aforras operaciónes e capas |
||
| - Remove line 10 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
por que fas isto? para gardar o orixinal?