Commit Graph

198 Commits

Author SHA1 Message Date
Bret Fisher
88d04ef085 updating GHA paths 2022-12-09 15:57:14 -05:00
Bret Fisher
9164019490 disable Hub until bot account works 2022-12-03 09:15:52 -05:00
Bret Fisher
5b2987f956 docker build gha init 2022-12-02 19:14:35 -05:00
Michael Irwin
e96cc16420 Merge pull request #243 from Alirezaaraby/master
Update README.md
2022-11-29 00:30:17 -05:00
Alirezaarabi
19a15ef6a9 Update README.md 2022-07-25 23:58:07 +04:30
Justin Cormack
5edf3f7c8d Merge pull request #197 from StefanScherer/update-dotnet-3-1
Update dotnet 3.1 (needed to support Apple Silicon M1)
2021-05-05 17:24:30 +01:00
Stefan Scherer
89e063d047 Update TargetFramework to 3.1
Signed-off-by: Stefan Scherer <stefan.scherer@docker.com>
2021-05-05 18:16:17 +02:00
Stefan Scherer
4553484152 Update dotnet 3.1 2021-02-12 18:28:07 +01:00
Bret Fisher
e433be5d16 remove unused Jenkins 2021-01-29 17:42:16 -05:00
Bret Fisher
a33c638b2f adding data seeding
Just run "docker-compose -f docker-compose.seed.yml up" to seed (you need to "docker-compose up -d" first)
2021-01-29 17:38:20 -05:00
Bret Fisher
d1920ed44a added vote logging 2021-01-29 17:06:20 -05:00
Bret Fisher
af94bc5c08 added new maintainers! 2021-01-29 17:01:55 -05:00
Bret Fisher
383b74158e healthchecks! move to compose spec version! 2021-01-29 16:47:31 -05:00
Bret Fisher
69c11f95a3 update deps, add tini and curl, use COPY not ADD 2021-01-29 16:47:09 -05:00
Bret Fisher
71c87af450 Merge pull request #194 from dockersamples/dependabot/npm_and_yarn/result/socket.io-2.4.0
Bump socket.io from 2.2.0 to 2.4.0 in /result
2021-01-29 13:00:22 -05:00
Bret Fisher
176ed0ee73 Merge pull request #152 from pocteo/feature/add_vote_namespace
Add missing vote namespace
2021-01-29 12:32:43 -05:00
Bret Fisher
9cf769db32 Merge pull request #186 from DanArlowski/patch-1
Version Was invalid, Fix to Version3 docker-compose
2021-01-29 12:29:06 -05:00
dependabot[bot]
ad6e9f1f69 Bump socket.io from 2.2.0 to 2.4.0 in /result
Bumps [socket.io](https://github.com/socketio/socket.io) from 2.2.0 to 2.4.0.
- [Release notes](https://github.com/socketio/socket.io/releases)
- [Changelog](https://github.com/socketio/socket.io/blob/2.4.0/CHANGELOG.md)
- [Commits](https://github.com/socketio/socket.io/compare/2.2.0...2.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-01-21 10:46:13 +00:00
Bret Fisher
7bbb599a4b Merge pull request #145 from sixeyed/master
Fix .NET Core images
2020-12-14 01:55:23 -05:00
Bret Fisher
258c562a19 Merge pull request #191 from schollii/patch-1
Update readme
2020-12-14 01:51:11 -05:00
Oliver L Schoenborn
bdac94dee9 Update readme
Clarify architecture not a repr of proper arch, since lots of viewers are likely to be new to the world of containerized apps
2020-12-13 20:32:12 -05:00
DanArlowski
6494a7a7e0 Version Was invalid, Fix to Version3 docker-compose
replicas cant be 2 because of port allocation
2020-11-04 10:14:53 +02:00
Jenny Burcio
245c8f3aa1 Merge pull request #159 from shipyardbuild/fix-postgres-init
Set an explicit username and password for the db service
2020-02-19 12:51:14 -08:00
Peter Valdez
e8e002bb23 Set an explicit username/password for Postgres in the swarm and k8s files too 2020-02-19 14:57:37 -05:00
Peter Valdez
7d1e4a982d Set an explicit username/password for Postgres in the other Compose files too 2020-02-19 14:44:54 -05:00
Peter Valdez
a8888af480 Set an explicit username and password for the db service 2020-02-15 23:45:28 -05:00
pocteo
1fb33ca60c Add missing vote namespace 2019-11-13 14:37:33 +01:00
Jenny Burcio
2209b3a776 Merge pull request #146 from lucj/master
Incorrect label for worker Deployment in .spec.selector.matchLabels
2019-09-10 08:28:52 -07:00
Luc Juggery
1c8890582a Incorrect label for worker Deployment in .spec.selector.matchLabels 2019-09-10 09:13:41 +02:00
Elton Stoneman
82e57900e5 Update to .NET Core 2.1 & pin images 2019-08-29 08:09:11 -06:00
Elton Stoneman
3dca8620e5 Update images for Windows 1809 2019-08-29 07:33:43 -06:00
Jenny Burcio
e26e9759a4 Merge pull request #139 from BretFisher/ignore-node-modules
ignore node_modules in git and docker build
2019-08-27 12:14:02 -07:00
Jenny Burcio
bfa3d14b16 Merge pull request #140 from BretFisher/update-result-deps
Update result node version and npm dependencies
2019-08-27 12:13:35 -07:00
Jenny Burcio
df86c45915 Merge pull request #141 from BretFisher/fix-worker-depends-on
fix worker compose depends_on
2019-08-27 12:13:22 -07:00
Jenny Burcio
b687b25230 Merge pull request #144 from BretFisher/update-kube-deployments
update Kubernetes manifests to app/v1 and yaml parity
2019-08-27 12:11:04 -07:00
Bret Fisher
c0e29c622c update to app/v1 and yaml parity
update yaml to current deployment manifest defaults and try for more pairity between kube-deploy.yml and k8s-specifications
2019-08-26 01:52:41 -04:00
Bret Fisher
563773c980 Changes to node slim to fix Jenkins PR build 2019-08-25 18:24:05 -04:00
Bret Fisher
41f2764b94 fix worker depends_on
There was inconsistency in the worker compose yaml for depends_on. The worker requires both db and redis, and in the default docker-compose.yml it was missing db, causing worker to crash on `docker-compose up`. In two other compose files for stacks, where depends_on was used for other services, I added it for the worker to match.
2019-08-25 16:50:48 -04:00
Bret Fisher
793e02efc4 update result to node 10 and latest npm packages
The result app was years out of date with node and npm packages, and required multiple changes to use the current supported socket.io and postgres db libs. Minimal changes to server.js to support change in pg syntax. A few minor changes to Dockerfile to improve readability, conform to docker best practices, and change to use npm ci to ensure future builds don't break again due to difference between package and package-lock.
2019-08-25 16:12:01 -04:00
Bret Fisher
368968c4af change result to use local angular
To match other .js loading patterns in this repo, don't use a CDN angular, but rather a local copy in case examples are used offline or in large classrooms with slow internet. Also updated to latest angular 1.4
2019-08-25 16:07:39 -04:00
Bret Fisher
4350dd6738 ignore node_modules in git and docker build 2019-08-25 15:17:56 -04:00
Mano Marks
1cea6e5bb0 Merge pull request #131 from spuder/patch-1
Fix typo in markdown
2018-11-01 13:10:19 -07:00
Spencer Owen
fc0da4618d Fix typo in markdown 2018-10-31 14:53:32 -06:00
Mano Marks
0b1500840e Merge pull request #129 from BretFisher/patch-2
Delete dockercloud.yml
2018-10-29 15:22:00 -07:00
Mano Marks
fb09f2d5d7 Merge pull request #128 from BretFisher/patch-1
Remove published swarm stack redis port
2018-10-29 15:21:27 -07:00
Bret Fisher
b35de77e58 Delete dockercloud.yml
RIP Cloud.
2018-10-29 22:20:53 +00:00
Bret Fisher
ee24b9b3e8 Remove published swarm stack redis port 2018-10-29 22:17:16 +00:00
Mano Marks
768172eaf3 Merge pull request #124 from lucj/master
Add instruction to add namespace for k8s deployment
2018-10-25 13:13:15 -07:00
Mano Marks
f890ec15bc Merge pull request #125 from sixeyed/master
Add Windows 1809 support
2018-10-22 07:11:25 -07:00
Elton Stoneman
6dfc628088 Add Windows 1809 support 2018-10-22 11:27:04 +01:00