Skip to content

Commit 831185a

Browse files
authored
Merge pull request #7 from yangcao77/main
update sample
2 parents c43284b + 7527362 commit 831185a

File tree

5 files changed

+28
-9
lines changed

5 files changed

+28
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,5 @@ nb-configuration.xml
3737

3838
# Local environment
3939
.env
40+
41+
.odo/env
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,16 @@ spec:
2323
limits:
2424
memory: "1024Mi"
2525
cpu: "500m"
26+
---
27+
kind: Service
28+
apiVersion: v1
29+
metadata:
30+
name: my-java-quarkus-svc
31+
spec:
32+
ports:
33+
- name: http-8081
34+
port: 8081
35+
protocol: TCP
36+
targetPort: 8081
37+
selector:
38+
app: java-quarkus-app

devfile.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
schemaVersion: 2.2.0
22
metadata:
33
name: java-quarkus
4-
version: 1.1.0
4+
version: 1.2.0
55
provider: Red Hat
66
supportUrl: https://github.com/devfile-samples/devfile-support#support-information
77
website: https://quarkus.io
@@ -16,14 +16,14 @@ parent:
1616
id: java-quarkus
1717
registryUrl: "https://registry.devfile.io"
1818
components:
19-
- name: outerloop-build
19+
- name: image-build
2020
image:
2121
imageName: java-quarkus-image:latest
2222
dockerfile:
2323
uri: src/main/docker/Dockerfile.jvm.staged
2424
buildContext: .
2525
rootRequired: false
26-
- name: outerloop-deploy
26+
- name: kubernetes-deploy
2727
attributes:
2828
deployment/replicas: 1
2929
deployment/cpuLimit: "100m"
@@ -32,19 +32,23 @@ components:
3232
deployment/memoryRequest: 100Mi
3333
deployment/container-port: 8081
3434
kubernetes:
35-
uri: outerloop-deploy.yaml
35+
uri: deploy.yaml
36+
endpoints:
37+
- name: http-8081
38+
targetPort: 8081
39+
path: /
3640
commands:
3741
- id: build-image
3842
apply:
39-
component: outerloop-build
43+
component: image-build
4044
- id: deployk8s
4145
apply:
42-
component: outerloop-deploy
46+
component: kubernetes-deploy
4347
- id: deploy
4448
composite:
4549
commands:
4650
- build-image
4751
- deployk8s
4852
group:
4953
kind: deploy
50-
isDefault: true
54+
isDefault: true

src/main/docker/Dockerfile.jvm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
3737
&& chown 1001:root /deployments \
3838
&& curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
3939
&& chown 1001 /deployments/run-java.sh \
40-
&& chmod 540 /deployments/run-java.sh \
40+
&& chmod 555 /deployments/run-java.sh \
4141
&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
4242

4343
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.

src/main/docker/Dockerfile.jvm.staged

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN microdnf install curl ca-certificates ${JAVA_PACKAGE} \
4747
&& chown 1001:root /deployments \
4848
&& curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/${RUN_JAVA_VERSION}/run-java-sh-${RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
4949
&& chown 1001 /deployments/run-java.sh \
50-
&& chmod 540 /deployments/run-java.sh \
50+
&& chmod 555 /deployments/run-java.sh \
5151
&& echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/lib/security/java.security
5252

5353
# Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.

0 commit comments

Comments
 (0)