Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
3dca862
Update images for Windows 1809
sixeyed Aug 29, 2019
82e5790
Update to .NET Core 2.1 & pin images
sixeyed Aug 29, 2019
1fb33ca
Add missing vote namespace
Nov 13, 2019
6494a7a
Version Was invalid, Fix to Version3 docker-compose
DanArlowski Nov 4, 2020
bdac94d
Update readme
schollii Dec 14, 2020
258c562
Merge pull request #191 from schollii/patch-1
BretFisher Dec 14, 2020
7bbb599
Merge pull request #145 from sixeyed/master
BretFisher Dec 14, 2020
ad6e9f1
Bump socket.io from 2.2.0 to 2.4.0 in /result
dependabot[bot] Jan 21, 2021
9cf769d
Merge pull request #186 from DanArlowski/patch-1
BretFisher Jan 29, 2021
176ed0e
Merge pull request #152 from pocteo/feature/add_vote_namespace
BretFisher Jan 29, 2021
71c87af
Merge pull request #194 from dockersamples/dependabot/npm_and_yarn/re…
BretFisher Jan 29, 2021
69c11f9
update deps, add tini and curl, use COPY not ADD
BretFisher Jan 29, 2021
383b741
healthchecks! move to compose spec version!
BretFisher Jan 29, 2021
af94bc5
added new maintainers!
BretFisher Jan 29, 2021
d1920ed
added vote logging
BretFisher Jan 29, 2021
a33c638
adding data seeding
BretFisher Jan 29, 2021
e433be5
remove unused Jenkins
BretFisher Jan 29, 2021
4553484
Update dotnet 3.1
StefanScherer Feb 12, 2021
89e063d
Update TargetFramework to 3.1
StefanScherer May 5, 2021
5edf3f7
Merge pull request #197 from StefanScherer/update-dotnet-3-1
justincormack May 5, 2021
19a15ef
Update README.md
Alirezaaraby Jul 25, 2022
e96cc16
Merge pull request #243 from Alirezaaraby/master
mikesir87 Nov 29, 2022
5b2987f
docker build gha init
BretFisher Dec 3, 2022
9164019
disable Hub until bot account works
BretFisher Dec 3, 2022
db6f956
Fix the case of losing a vote when actual vote found in Redis and db …
ErjanGavalji Dec 8, 2022
88d04ef
updating GHA paths
BretFisher Dec 9, 2022
6f953ce
enable docker hub
BretFisher Dec 9, 2022
5a23ae2
disable worker arm/v7 support for now
BretFisher Dec 9, 2022
372d825
Merge pull request #266 from ErjanGavalji/main
mikesir87 Dec 9, 2022
3ccc624
update result node.js deps for multi-arch
BretFisher Dec 9, 2022
f379254
Merge pull request #268 from dockersamples/update-result-deps
mikesir87 Dec 16, 2022
0f4f923
Merge branch 'main' into gha-init
BretFisher Dec 16, 2022
eaa19a7
Merge pull request #263 from dockersamples/gha-init
mikesir87 Dec 16, 2022
7e7445a
Clean up worker service (#272)
mikesir87 Dec 16, 2022
f0fb81f
Adding docker hub to push list (#271)
BretFisher Dec 16, 2022
226edf0
compose and K8s file cleanup (#273)
BretFisher Dec 17, 2022
93ee0a5
fix dotnet build (#274)
BretFisher Dec 17, 2022
c76fbd6
Remove namespace from k8s example (#275)
BretFisher Dec 17, 2022
0737688
add before and after tags for demos (#276)
BretFisher Dec 17, 2022
f1445f4
remove dupe dotnet voting and result apps (#277)
BretFisher Dec 17, 2022
897171c
remove redis port (#278)
BretFisher Dec 17, 2022
3accda9
updated architecture diag (#286)
BretFisher Feb 23, 2023
574e6a7
Adding a git attributes file to avoid EOL issues
Apr 6, 2023
f9c58a0
Update vote service to python:3.11
mikesir87 Sep 18, 2023
67cab55
Update result libs to latest versions & resolve socket.io CVE
mikesir87 Sep 18, 2023
d268b89
Simplify .NET multi-platform Dockerfile (#301)
lbussell Oct 18, 2023
6286b6c
Add debug port support for the results (node) app
mikesir87 Oct 19, 2023
cdfd5e0
Merge pull request #307 from dockersamples/update-versions
mikesir87 Oct 24, 2023
85b4013
Merge pull request #308 from dockersamples/add-node-debugger-support
mikesir87 Oct 24, 2023
7e0e20a
Don't break on user script at start and bind debug only locally
mikesir87 Oct 24, 2023
c688f50
Merge pull request #310 from dockersamples/adjust-inspect
mikesir87 Oct 24, 2023
5c3aa29
Fix file mounts (work dir change) and python reloading
mikesir87 Oct 27, 2023
8b0f5ad
Merge pull request #311 from dockersamples/fix-python-reloading
mikesir87 Oct 27, 2023
2dede80
Adjust name of debug launch config
mikesir87 Nov 2, 2023
8cd0cad
Merge pull request #292 from julienadam/main
mikesir87 Sep 20, 2024
2932a6f
lint: fix LegacyKeyValueFormat
dvdksn Oct 10, 2024
0d75901
lint: fix FromAsCasing
dvdksn Oct 10, 2024
1940973
lint: fix JSONArgsRecommended
dvdksn Oct 10, 2024
a4901e4
lint: fix InvalidDefinitionDescription
dvdksn Oct 10, 2024
1df1971
Merge pull request #379 from dvdksn/example-voting-app-fixups
mikesir87 Oct 10, 2024
620c76c
Change ports of vote/result ports from 5000/5001 to 8080/8081
mikesir87 Oct 10, 2024
63e9150
Merge pull request #380 from dockersamples/change-ports
mikesir87 Oct 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Set default behavior to automatically normalize line endings.
* text=auto

# Force batch scripts to always use CRLF line endings so that if a repo is accessed
# in Windows via a file share from Linux, the scripts will work.
*.{cmd,[cC][mM][dD]} text eol=crlf
*.{bat,[bB][aA][tT]} text eol=crlf
*.{ics,[iI][cC][sS]} text eol=crlf

# Force bash scripts to always use LF line endings so that if a repo is accessed
# in Unix via a file share from Windows, the scripts will work.
*.sh text eol=lf
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
# Maintain dependencies for GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
82 changes: 82 additions & 0 deletions .github/workflows/call-docker-build-result.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Build Result
# template source: https://github.com/dockersamples/.github/blob/main/templates/call-docker-build.yaml

on:
# we want pull requests so we can build(test) but not push to image registry
push:
branches:
- 'main'
# only build when important files change
paths:
- 'result/**'
- '.github/workflows/call-docker-build-result.yaml'
pull_request:
branches:
- 'main'
# only build when important files change
paths:
- 'result/**'
- '.github/workflows/call-docker-build-result.yaml'

jobs:
call-docker-build:

name: Result Call Docker Build

uses: dockersamples/.github/.github/workflows/reusable-docker-build.yaml@main

permissions:
contents: read
packages: write # needed to push docker image to ghcr.io
pull-requests: write # needed to create and update comments in PRs

secrets:

# Only needed if with:dockerhub-enable is true below
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}

# Only needed if with:dockerhub-enable is true below
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

with:

### REQUIRED
### ENABLE ONE OR BOTH REGISTRIES
### tell docker where to push.
### NOTE if Docker Hub is set to true, you must set secrets above and also add account/repo/tags below
dockerhub-enable: true
ghcr-enable: true

### REQUIRED
### A list of the account/repo names for docker build. List should match what's enabled above
### defaults to:
image-names: |
ghcr.io/dockersamples/example-voting-app-result
dockersamples/examplevotingapp_result

### REQUIRED set rules for tagging images, based on special action syntax:
### https://github.com/docker/metadata-action#tags-input
### defaults to:
tag-rules: |
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=raw,value=before,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=raw,value=after,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=ref,event=pr

### path to where docker should copy files into image
### defaults to root of repository (.)
context: result

### Dockerfile alternate name. Default is Dockerfile (relative to context path)
# file: Containerfile

### build stage to target, defaults to empty, which builds to last stage in Dockerfile
# target:

### platforms to build for, defaults to linux/amd64
### other options: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64,linux/arm64,linux/arm/v7

### Create a PR comment with image tags and labels
### defaults to false
# comment-enable: false
82 changes: 82 additions & 0 deletions .github/workflows/call-docker-build-vote.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Build Vote
# template source: https://github.com/dockersamples/.github/blob/main/templates/call-docker-build.yaml

on:
# we want pull requests so we can build(test) but not push to image registry
push:
branches:
- 'main'
# only build when important files change
paths:
- 'vote/**'
- '.github/workflows/call-docker-build-vote.yaml'
pull_request:
branches:
- 'main'
# only build when important files change
paths:
- 'vote/**'
- '.github/workflows/call-docker-build-vote.yaml'

jobs:
call-docker-build:

name: Vote Call Docker Build

uses: dockersamples/.github/.github/workflows/reusable-docker-build.yaml@main

permissions:
contents: read
packages: write # needed to push docker image to ghcr.io
pull-requests: write # needed to create and update comments in PRs

secrets:

# Only needed if with:dockerhub-enable is true below
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}

# Only needed if with:dockerhub-enable is true below
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

with:

### REQUIRED
### ENABLE ONE OR BOTH REGISTRIES
### tell docker where to push.
### NOTE if Docker Hub is set to true, you must set secrets above and also add account/repo/tags below
dockerhub-enable: true
ghcr-enable: true

### REQUIRED
### A list of the account/repo names for docker build. List should match what's enabled above
### defaults to:
image-names: |
ghcr.io/dockersamples/example-voting-app-vote
dockersamples/examplevotingapp_vote

### REQUIRED set rules for tagging images, based on special action syntax:
### https://github.com/docker/metadata-action#tags-input
### defaults to:
tag-rules: |
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=raw,value=before,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=raw,value=after,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=ref,event=pr

### path to where docker should copy files into image
### defaults to root of repository (.)
context: vote

### Dockerfile alternate name. Default is Dockerfile (relative to context path)
# file: Containerfile

### build stage to target, defaults to empty, which builds to last stage in Dockerfile
# target:

### platforms to build for, defaults to linux/amd64
### other options: linux/amd64,linux/arm64,linux/arm/v7
platforms: linux/amd64,linux/arm64,linux/arm/v7

### Create a PR comment with image tags and labels
### defaults to false
# comment-enable: false
82 changes: 82 additions & 0 deletions .github/workflows/call-docker-build-worker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
name: Build Worker
# template source: https://github.com/dockersamples/.github/blob/main/templates/call-docker-build.yaml

on:
# we want pull requests so we can build(test) but not push to image registry
push:
branches:
- 'main'
# only build when important files change
paths:
- 'worker/**'
- '.github/workflows/call-docker-build-worker.yaml'
pull_request:
branches:
- 'main'
# only build when important files change
paths:
- 'worker/**'
- '.github/workflows/call-docker-build-worker.yaml'

jobs:
call-docker-build:

name: Worker Call Docker Build

uses: dockersamples/.github/.github/workflows/reusable-docker-build.yaml@main

permissions:
contents: read
packages: write # needed to push docker image to ghcr.io
pull-requests: write # needed to create and update comments in PRs

secrets:

# Only needed if with:dockerhub-enable is true below
dockerhub-username: ${{ secrets.DOCKERHUB_USERNAME }}

# Only needed if with:dockerhub-enable is true below
dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

with:

### REQUIRED
### ENABLE ONE OR BOTH REGISTRIES
### tell docker where to push.
### NOTE if Docker Hub is set to true, you must set secrets above and also add account/repo/tags below
dockerhub-enable: true
ghcr-enable: true

### REQUIRED
### A list of the account/repo names for docker build. List should match what's enabled above
### defaults to:
image-names: |
ghcr.io/dockersamples/example-voting-app-worker
dockersamples/examplevotingapp_worker

### REQUIRED set rules for tagging images, based on special action syntax:
### https://github.com/docker/metadata-action#tags-input
### defaults to:
tag-rules: |
type=raw,value=latest,enable=${{ endsWith(github.ref, github.event.repository.default_branch) }}
type=ref,event=pr

### path to where docker should copy files into image
### defaults to root of repository (.)
context: worker

### Dockerfile alternate name. Default is Dockerfile (relative to context path)
# file: Containerfile

### build stage to target, defaults to empty, which builds to last stage in Dockerfile
# target:

### platforms to build for, defaults to linux/amd64
### other options: linux/amd64,linux/arm64,linux/arm/v7
# FIXME worker arm/v7 support doesn't build in .net core 3.1 with QEMU
# a fix would likely run the .net build on amd64 but with a target of arm/v7
platforms: linux/amd64,linux/arm64,linux/arm/v7

### Create a PR comment with image tags and labels
### defaults to false
# comment-enable: false
20 changes: 20 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Node: Results debugger",
"type": "node",
"request": "attach",
"port": 9229,
"address": "localhost",
"skipFiles": [
"<node_internals>/**"
],
"remoteRoot": "/app",
"localRoot": "${workspaceFolder}/result"
}
]
}
37 changes: 0 additions & 37 deletions ExampleVotingApp.sln

This file was deleted.

54 changes: 0 additions & 54 deletions Jenkinsfile

This file was deleted.

4 changes: 4 additions & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Bret Fisher <bret@bretfisher.com>
Michael Irwin <mikesir87@gmail.com>

# Alumni, thanks for your work!
Aanand Prasad <aanand@docker.com>
Ben Firshman <bfirsh@docker.com>
Fernando Mayo <fernanodo.mayo@docker.com>
Expand Down
Loading