Commit Graph

167 Commits

Author SHA1 Message Date
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
Luc Juggery
5d355dbd80 Add instruction to add namespace 2018-10-10 11:10:21 +02:00
Mano Marks
59ec1dfc7d
Merge pull request #123 from lucj/master
Add namespace to k8s deployments and services
2018-10-10 01:27:28 -07:00
Luc Juggery
cd14ae1d9e Add namespace to k8s deployments and services 2018-10-09 21:51:59 +02:00
Mano Marks
bba801925e
Merge pull request #122 from sixeyed/master
Add .NET Core variants running in Windows containers
2018-09-26 14:39:35 -07:00
Elton Stoneman
bcb2e0ed1c Document Windows options 2018-09-26 20:00:28 +01:00
Elton Stoneman
e16d6efe6a Merge remote-tracking branch 'upstream/master' 2018-09-26 19:43:38 +01:00
Elton Stoneman
ac496c8b7e Pin to Nano Server SAC 2016 images 2018-09-26 19:41:20 +01:00
Elton Stoneman
93ba2be2c1 Add config from environment variables 2018-09-26 12:12:48 +01:00
Elton Stoneman
6356ddc7c6 Fix initial load 2018-09-26 11:58:32 +01:00
Elton Stoneman
97d0ae2170 Add MySql result loader 2018-09-26 11:32:50 +01:00
Elton Stoneman
985af62bb1 Results site in .NET Core 2018-09-26 10:29:39 +01:00
Elton Stoneman
879e5bc477 Add .NET Core 2.1 versions 2018-09-21 19:23:31 +01:00
Mano Marks
b3f42f48c8
Merge pull request #121 from ManoMarks/master
adding simple stack file for getting started
2018-09-20 15:44:12 -07:00
Mano Marks
d80c43b8f4 adding simple stack file for getting started 2018-09-20 15:42:35 -07:00
Mano Marks
0e74021fd8
Merge pull request #117 from dave-tucker/jenkinsfile
Update Jenkinsfile
2018-08-16 17:45:46 -07:00
Dave Tucker
0355778d6e Update Jenkinsfile
- Rewrite as declarative
- Add credentials
- Gate images pushes to master branch only

Signed-off-by: Dave Tucker <dt@docker.com>
2018-08-16 23:45:13 +01:00
spara
b832e37864 added Jenkinsfile 2018-07-30 11:23:50 -05:00
spara
a56b748832 updated .gitignore 2018-07-30 11:20:25 -05:00
Mano Marks
d7b6bad9b1
Merge pull request #115 from salvatoris/patch-1
Fix typo in the comment
2018-07-17 11:12:41 -07:00
Rodion Fedorov
0e4a079691
Fix typo in the comment 2018-07-17 20:49:40 +03:00
Mano Marks
be88b97db1
Merge pull request #107 from lucj/master
Add k8s specifications
2018-03-20 12:54:03 -07:00
Luc Juggery
0fd383ce27 Add k8s specfications 2018-03-05 12:57:48 +01:00
Mano Marks
e3eb2dbd2a
Merge pull request #104 from gabrielvv/master
missing path module and console.err -> console.error
2018-02-01 15:37:33 -08:00
gabrielvv
b74cf0e973 missing path module and console.err -> console.error 2018-01-06 22:25:21 +01:00
Mano Marks
2cd3d55fb8
Merge pull request #100 from thaJeztah/fix-javaworker-result
Fix javaworker result service not starting
2018-01-04 10:25:19 -08:00
Mano Marks
ae9ea759bc
Merge pull request #101 from thaJeztah/improve-result-dockerfile
Optimize result image
2018-01-04 10:25:01 -08:00
Mano Marks
e5dfa4747b
Merge pull request #102 from thaJeztah/improve-java-worker
Optimize java-worker image
2018-01-04 10:24:25 -08:00
Sebastiaan van Stijn
8b6432d58d
Optimize java-worker image
This patch optimizes the java-worker image;

- Use multi-stage build to separate the build-stage from the "deploy" stage
- Switch to the official Maven image, instead of manual installation of Maven.
  The official Maven image is also based on the `openjdk` repository on Docker
  Hub, which replaces the (now deprecated) `java` repository.
- Use `COPY` instead of `ADD` to follow best-practice
- Add `-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap` arguments
  so that JAVA will take memory-limits into account
- Use a JRE base image for the final build-stage

This change brings the size of the final image down from 184MB to 87MB

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-04 12:39:17 +01:00
Sebastiaan van Stijn
45788a5f1c
Optimize result image
This patch makes some optimizations in the result service's image;

- switch to `node:8.9-alpine`, which a smaller base image
- use `https://` for the registry
- use `COPY` instead of `ADD`, following best pracice
- cleanup npm cache, and combine steps to reduce image size

These changes bring down the image size from 248MB to 81.2MB

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-04 12:26:14 +01:00
Sebastiaan van Stijn
a8daa2d956
Fix javaworker result service not starting
The `--debug` option is deprecated and caused the result
service to not start:

    result_1  | [nodemon] 1.14.7
    result_1  | [nodemon] to restart at any time, enter `rs`
    result_1  | [nodemon] watching: *.*
    result_1  | [nodemon] starting `node --debug server.js`
    result_1  | (node:20) [DEP0062] DeprecationWarning: `node --debug` and `node --debug-brk` are invalid. Please use `node --inspect` or `node --inspect-brk` instead.
    result_1  | [nodemon] app crashed - waiting for file changes before starting...

This patch removes the `--debug` option, as it's not needed,
and no longer present in the other example stacks.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-01-04 11:49:58 +01:00
Mano Marks
762543a06d
Merge pull request #98 from akimd/shellcheck
tests: please shellcheck
2017-12-14 10:14:27 -08:00