Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dockersamples/example-voting-app
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: mimek/example-voting-app
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 7 commits
  • 5 files changed
  • 1 contributor

Commits on Jul 10, 2022

  1. Update README.md

    @mimek
    mimek authored Jul 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cdf676d View commit details

  2. Update result-deployment.yaml

    @mimek
    mimek authored Jul 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0b0f80d View commit details

  3. Update vote-deployment.yaml

    @mimek
    mimek authored Jul 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1b78b09 View commit details

  4. Update worker-deployment.yaml

    @mimek
    mimek authored Jul 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8cac123 View commit details

  5. Update README.md

    @mimek
    mimek authored Jul 10, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9c0958 View commit details

Commits on Jul 15, 2022

  1. Update README.md

    @mimek
    mimek authored Jul 15, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2fae4f5 View commit details

  2. Update style.css

    @mimek
    mimek authored Jul 15, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d047ed View commit details
Showing with 5 additions and 5 deletions.
  1. +1 −1 README.md
  2. +1 −1 k8s-specifications/result-deployment.yaml
  3. +1 −1 k8s-specifications/vote-deployment.yaml
  4. +1 −1 k8s-specifications/worker-deployment.yaml
  5. +1 −1 vote/static/stylesheets/style.css
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Example Voting App
Example Voting App Test3
=========

A simple distributed application running across multiple Docker containers.
2 changes: 1 addition & 1 deletion k8s-specifications/result-deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ spec:
app: result
spec:
containers:
- image: dockersamples/examplevotingapp_result:before
- image: 130575395405.dkr.ecr.us-east-1.amazonaws.com/repo-542378966167-result:85
name: result
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion k8s-specifications/vote-deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ spec:
app: vote
spec:
containers:
- image: dockersamples/examplevotingapp_vote:before
- image: 130575395405.dkr.ecr.us-east-1.amazonaws.com/repo-542378966167-vote:85
name: vote
ports:
- containerPort: 80
2 changes: 1 addition & 1 deletion k8s-specifications/worker-deployment.yaml
View file
Original file line number Diff line number Diff line change
@@ -16,5 +16,5 @@ spec:
app: worker
spec:
containers:
- image: dockersamples/examplevotingapp_worker
- image: 130575395405.dkr.ecr.us-east-1.amazonaws.com/repo-542378966167-worker:85
name: worker
2 changes: 1 addition & 1 deletion vote/static/stylesheets/style.css
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
html,body{
margin: 0;
padding: 0;
background-color: #F7F8F9;
background-color: #00000;
height: 100vh;
font-family: 'Open Sans';
}