Skip to content

Commit 3e7948f

Browse files
authored
Merge pull request spring-petclinic#7 from odedia/master
Support for cloud-based platforms
2 parents 2e9ee8a + 9092e89 commit 3e7948f

File tree

92 files changed

+5281
-1198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+5281
-1198
lines changed

.DS_Store

8 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ target/
1616

1717
# Branch switching
1818
generated/
19+
.DS_Store

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
language: java
2-
jdk: openjdk8
2+
jdk: openjdk11

ci/pipeline.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
resource_types:
2+
- name: cf-cli-resource
3+
type: docker-image
4+
source:
5+
repository: nulldriver/cf-cli-resource
6+
tag: latest
7+
8+
resources:
9+
- name: cf
10+
type: cf
11+
source:
12+
api: ((cf-api))
13+
username: ((cf-username))
14+
password: ((cf-password))
15+
organization: ((cf-org))
16+
space: ((cf-space))
17+
- name: docker-image
18+
type: docker-image
19+
source:
20+
repository: spring-petclinic/api-gateway
21+
22+
jobs:
23+
- name: deploy
24+
plan:
25+
- get: docker-image
26+
trigger: true
27+
params:
28+
globs: [ "((app)).jar", "manifest.yml" ]
29+
- put: cf
30+
params:
31+
manifest: github-prerelease/manifest.yml
32+
current_app_name: ((app))
33+
- put: cf-add-network-policy
34+
resource: cf-env
35+
params:
36+
command: add-network-policy
37+
source_app: cloudnativepoll-webui
38+
destination_app: cloudnativepoll-backend

docker-compose.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
mem_limit: 512M
1515
depends_on:
1616
- config-server
17-
entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
17+
entrypoint: ["./dockerize","-wait=tcp://config-server:8888","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
1818
ports:
1919
- 8761:8761
2020

@@ -25,7 +25,7 @@ services:
2525
depends_on:
2626
- config-server
2727
- discovery-server
28-
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
28+
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
2929
ports:
3030
- 8081:8081
3131

@@ -36,7 +36,7 @@ services:
3636
depends_on:
3737
- config-server
3838
- discovery-server
39-
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
39+
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
4040
ports:
4141
- 8082:8082
4242

@@ -47,7 +47,7 @@ services:
4747
depends_on:
4848
- config-server
4949
- discovery-server
50-
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
50+
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
5151
ports:
5252
- 8083:8083
5353

@@ -58,7 +58,7 @@ services:
5858
depends_on:
5959
- config-server
6060
- discovery-server
61-
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
61+
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
6262
ports:
6363
- 8080:8080
6464

@@ -78,7 +78,7 @@ services:
7878
depends_on:
7979
- config-server
8080
- discovery-server
81-
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "org.springframework.boot.loader.JarLauncher"]
81+
entrypoint: ["./dockerize","-wait=tcp://discovery-server:8761","-timeout=60s","--","java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"]
8282
ports:
8383
- 9090:9090
8484

docs/wavefront-k8s.png

444 KB
Loading

docs/wavefront-summary.png

364 KB
Loading

docs/wavefront-traces.png

423 KB
Loading

includes/kind.mk

Lines changed: 0 additions & 15 deletions
This file was deleted.

k8s/.DS_Store

8 KB
Binary file not shown.

0 commit comments

Comments
 (0)