Skip to content

Commit ded7871

Browse files
RemiEvenRemiEven
committed
chore: add devcontainer configuration + update versions + use confluentinc images in docker-compose
1 parent 84cd7cc commit ded7871

31 files changed

+947
-343
lines changed

‎.devcontainer/devcontainer.json

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
2+
// README at: https://github.com/devcontainers/templates/tree/main/src/debian
3+
{
4+
"name": "Debian",
5+
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6+
"dockerComposeFile": ["../docker-compose.yaml", "docker-compose.extend.yaml"],
7+
"service": "java",
8+
"workspaceFolder": "/workspace",
9+
"shutdownAction": "stopCompose",
10+
"postStartCommand": "find -name application.properties -exec sed -i 's/localhost:9092/kafka:29092/g' {} \\;",
11+
"features": {
12+
"ghcr.io/devcontainers-contrib/features/maven-sdkman:2": {
13+
"version": "latest",
14+
"jdkVersion": "17",
15+
"jdkDistro": "tem"
16+
}
17+
}
18+
19+
// Use 'forwardPorts' to make a list of ports inside the container available locally.
20+
// "forwardPorts": [],
21+
22+
// Configure tool-specific properties.
23+
// "customizations": {},
24+
25+
// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
26+
// "remoteUser": "root"
27+
}

‎.devcontainer/docker-compose.extend.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
version: '3'
2+
services:
3+
java:
4+
image: mcr.microsoft.com/devcontainers/base:bullseye
5+
volumes:
6+
# Mounts the project folder to '/workspace'. While this file is in .devcontainer,
7+
# mounts are relative to the first file in the list, which is a level up.
8+
- .:/workspace:cached
9+
10+
# Overrides default command so things don't shut down after the process ends.
11+
command: /bin/sh -c "while sleep 1000; do :; done"
12+
ports:
13+
- 8080:8080
14+
- 8081:8081
15+
expose:
16+
- 8080
17+
- 8081

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@
2323
hs_err_pid*
2424

2525
.idea/
26+
.vscode

‎docker-compose.yaml

+14-20
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
1-
version: '2'
1+
version: '3'
22

33
services:
44

55
zookeeper:
6-
image: strimzi/kafka:0.19.0-kafka-2.5.0
7-
command: [
8-
"sh", "-c",
9-
"bin/zookeeper-server-start.sh config/zookeeper.properties"
10-
]
11-
ports:
12-
- "2181:2181"
6+
image: confluentinc/cp-zookeeper:7.4.0
137
environment:
14-
LOG_DIR: /tmp/logs
15-
8+
ZOOKEEPER_CLIENT_PORT: 2181
9+
ZOOKEEPER_TICK_TIME: 2000
1610
kafka:
17-
image: strimzi/kafka:0.19.0-kafka-2.5.0
18-
command: [
19-
"sh", "-c",
20-
"bin/kafka-server-start.sh config/server.properties --override listeners=$${KAFKA_LISTENERS} --override advertised.listeners=$${KAFKA_ADVERTISED_LISTENERS} --override zookeeper.connect=$${KAFKA_ZOOKEEPER_CONNECT}"
21-
]
11+
image: confluentinc/cp-kafka:7.4.0
2212
depends_on:
2313
- zookeeper
2414
ports:
25-
- "9092:9092"
15+
- 9092:9092
16+
expose:
17+
- 29092
2618
environment:
27-
LOG_DIR: "/tmp/logs"
28-
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
29-
KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:9092
30-
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
19+
KAFKA_BROKER_ID: 1
20+
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
21+
KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
22+
KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT
23+
KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
24+
KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1

‎order-api/.dockerignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
*
2+
!target/*-runner
3+
!target/*-runner.jar
4+
!target/lib/*
5+
!target/quarkus-app/*

‎order-api/.gitignore

+7
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ pom.xml.tag
44
pom.xml.releaseBackup
55
pom.xml.versionsBackup
66
release.properties
7+
.flattened-pom.xml
8+
79
# Eclipse
810
.project
911
.classpath
@@ -34,3 +36,8 @@ nb-configuration.xml
3436
*.orig
3537
*.rej
3638

39+
# Local environment
40+
.env
41+
42+
# Plugin directory
43+
/.quarkus/cli/plugins/

‎order-api/README.md

+22-14
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,49 @@ If you want to learn more about Quarkus, please visit its website: https://quark
88

99
You can run your application in dev mode that enables live coding using:
1010
```shell script
11-
./mvnw compile quarkus:dev
11+
mvn compile quarkus:dev
1212
```
1313

14+
> **_NOTE:_** Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
15+
1416
## Packaging and running the application
1517

1618
The application can be packaged using:
1719
```shell script
18-
./mvnw package
20+
mvn package
1921
```
20-
It produces the `order-api-1.0.0-SNAPSHOT-runner.jar` file in the `/target` directory.
21-
Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/lib` directory.
22+
It produces the `quarkus-run.jar` file in the `target/quarkus-app/` directory.
23+
Be aware that it’s not an _über-jar_ as the dependencies are copied into the `target/quarkus-app/lib/` directory.
24+
25+
The application is now runnable using `java -jar target/quarkus-app/quarkus-run.jar`.
2226

2327
If you want to build an _über-jar_, execute the following command:
2428
```shell script
25-
./mvnw package -Dquarkus.package.type=uber-jar
29+
mvn package -Dquarkus.package.type=uber-jar
2630
```
2731

28-
The application is now runnable using `java -jar target/order-api-1.0.0-SNAPSHOT-runner.jar`.
32+
The application, packaged as an _über-jar_, is now runnable using `java -jar target/*-runner.jar`.
2933

3034
## Creating a native executable
3135

32-
You can create a native executable using:
36+
You can create a native executable using:
3337
```shell script
34-
./mvnw package -Pnative
38+
mvn package -Dnative
3539
```
3640

37-
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
41+
Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
3842
```shell script
39-
./mvnw package -Pnative -Dquarkus.native.container-build=true
43+
mvn package -Dnative -Dquarkus.native.container-build=true
4044
```
4145

42-
You can then execute your native executable with: `./target/order-api-1.0.0-SNAPSHOT-runner`
46+
You can then execute your native executable with: `./target/code-with-quarkus-1.0.0-SNAPSHOT-runner`
47+
48+
If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.
49+
50+
## Provided Code
4351

44-
If you want to learn more about building native executables, please consult https://quarkus.io/guides/maven-tooling.html.
52+
### RESTEasy Reactive
4553

46-
# Command Mode
54+
Easily start your Reactive RESTful Web Services
4755

48-
Guide: https://quarkus.io/guides/command-mode-reference
56+
[Related guide section...](https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources)

‎order-api/pom.xml

+47-29
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
<version>1.0.0-SNAPSHOT</version>
88
<properties>
99
<compiler-plugin.version>3.11.0</compiler-plugin.version>
10-
<maven.compiler.parameters>true</maven.compiler.parameters>
11-
<maven.compiler.release>17</maven.compiler.release>
10+
<java.version>17</java.version>
11+
<maven.compiler.release>${java.version}</maven.compiler.release>
12+
<maven.compiler.source>${java.version}</maven.compiler.source>
13+
<maven.compiler.target>${java.version}</maven.compiler.target>
1214
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1315
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1416
<quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
1517
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
16-
<quarkus.platform.version>3.4.3</quarkus.platform.version>
18+
<quarkus.platform.version>3.4.2</quarkus.platform.version>
1719
<skipITs>true</skipITs>
1820
<surefire-plugin.version>3.1.2</surefire-plugin.version>
1921
</properties>
@@ -29,30 +31,44 @@
2931
</dependencies>
3032
</dependencyManagement>
3133
<dependencies>
34+
<dependency>
35+
<groupId>io.quarkus</groupId>
36+
<artifactId>quarkus-arc</artifactId>
37+
</dependency>
38+
<dependency>
39+
<groupId>io.quarkus</groupId>
40+
<artifactId>quarkus-jsonb</artifactId>
41+
</dependency>
3242
<dependency>
3343
<groupId>io.quarkus</groupId>
3444
<artifactId>quarkus-resteasy-jsonb</artifactId>
3545
</dependency>
3646
<dependency>
3747
<groupId>io.quarkus</groupId>
38-
<artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
48+
<artifactId>quarkus-resteasy</artifactId>
3949
</dependency>
4050
<dependency>
4151
<groupId>io.quarkus</groupId>
42-
<artifactId>quarkus-arc</artifactId>
52+
<artifactId>quarkus-smallrye-reactive-messaging-kafka</artifactId>
4353
</dependency>
4454
<dependency>
4555
<groupId>io.quarkus</groupId>
4656
<artifactId>quarkus-junit5</artifactId>
4757
<scope>test</scope>
4858
</dependency>
59+
<dependency>
60+
<groupId>io.rest-assured</groupId>
61+
<artifactId>rest-assured</artifactId>
62+
<scope>test</scope>
63+
</dependency>
4964
</dependencies>
5065
<build>
5166
<plugins>
5267
<plugin>
53-
<groupId>io.quarkus</groupId>
68+
<groupId>${quarkus.platform.group-id}</groupId>
5469
<artifactId>quarkus-maven-plugin</artifactId>
5570
<version>${quarkus.platform.version}</version>
71+
<extensions>true</extensions>
5672
<executions>
5773
<execution>
5874
<goals>
@@ -66,6 +82,11 @@
6682
<plugin>
6783
<artifactId>maven-compiler-plugin</artifactId>
6884
<version>${compiler-plugin.version}</version>
85+
<configuration>
86+
<compilerArgs>
87+
<arg>-parameters</arg>
88+
</compilerArgs>
89+
</configuration>
6990
</plugin>
7091
<plugin>
7192
<artifactId>maven-surefire-plugin</artifactId>
@@ -77,6 +98,25 @@
7798
</systemPropertyVariables>
7899
</configuration>
79100
</plugin>
101+
<plugin>
102+
<artifactId>maven-failsafe-plugin</artifactId>
103+
<version>${surefire-plugin.version}</version>
104+
<executions>
105+
<execution>
106+
<goals>
107+
<goal>integration-test</goal>
108+
<goal>verify</goal>
109+
</goals>
110+
<configuration>
111+
<systemPropertyVariables>
112+
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
113+
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
114+
<maven.home>${maven.home}</maven.home>
115+
</systemPropertyVariables>
116+
</configuration>
117+
</execution>
118+
</executions>
119+
</plugin>
80120
</plugins>
81121
</build>
82122
<profiles>
@@ -87,30 +127,8 @@
87127
<name>native</name>
88128
</property>
89129
</activation>
90-
<build>
91-
<plugins>
92-
<plugin>
93-
<artifactId>maven-failsafe-plugin</artifactId>
94-
<version>${surefire-plugin.version}</version>
95-
<executions>
96-
<execution>
97-
<goals>
98-
<goal>integration-test</goal>
99-
<goal>verify</goal>
100-
</goals>
101-
<configuration>
102-
<systemPropertyVariables>
103-
<native.image.path>${project.build.directory}/${project.build.finalName}-runner</native.image.path>
104-
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
105-
<maven.home>${maven.home}</maven.home>
106-
</systemPropertyVariables>
107-
</configuration>
108-
</execution>
109-
</executions>
110-
</plugin>
111-
</plugins>
112-
</build>
113130
<properties>
131+
<skipITs>false</skipITs>
114132
<quarkus.package.type>native</quarkus.package.type>
115133
</properties>
116134
</profile>

‎order-api/src/main/docker/Dockerfile.fast-jar

-57
This file was deleted.

0 commit comments

Comments
 (0)