Skip to content

Commit

Permalink
fix: "quarkus.container-image.*" entries not showing in the "All Conf…
Browse files Browse the repository at this point in the history
…iguration Options" guide

Fixes quarkusio#12316
  • Loading branch information
machi1990 committed Sep 24, 2020
1 parent ffbde8c commit a6819a7
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 3 deletions.
5 changes: 5 additions & 0 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1693,6 +1693,11 @@
<artifactId>quarkus-container-image-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-spi</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,10 @@ public static void main(String[] args) throws BootstrapMavenException, IOExcepti

// Temporary fix for https://github.com/quarkusio/quarkus/issues/5214 until we figure out how to fix it
Extension openApi = extensionsByGav.get("io.quarkus:quarkus-smallrye-openapi");
if (openApi != null)
if (openApi != null) {
extensionsByConfigRoots.put("io.quarkus.smallrye.openapi.common.deployment.SmallRyeOpenApiConfig", openApi);

}

// sort extensions by name, assign their config items based on their config roots
for (Entry<String, Extension> entry : extensionsByConfigRoots.entrySet()) {
List<ConfigDocItem> items = docItemsByConfigRoots.get(entry.getKey());
Expand Down
5 changes: 4 additions & 1 deletion extensions/container-image/deployment/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image-util</artifactId>
</dependency>

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-container-image</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand Down
1 change: 1 addition & 0 deletions extensions/container-image/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<name>Quarkus - Container Image</name>
<packaging>pom</packaging>
<modules>
<module>runtime</module>
<module>deployment</module>
<module>spi</module>
<module>util</module>
Expand Down
42 changes: 42 additions & 0 deletions extensions/container-image/runtime/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>quarkus-container-image-parent</artifactId>
<groupId>io.quarkus</groupId>
<version>999-SNAPSHOT</version>
</parent>

<artifactId>quarkus-container-image</artifactId>
<name>Quarkus - Container - Runtime</name>
<description>
Build container images of your application. Only needed to make sure that the container image
configuration is generated from the io.quarkus.container.image.deployment.ContainerImageConfig.
See https://github.com/quarkusio/quarkus/issues/12316#issuecomment-698287955 for more information.
</description>


<build>
<plugins>
<plugin>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-bootstrap-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-extension-processor</artifactId>
<version>${project.version}</version>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: "Container Image"
metadata:
keywords:
- "container"
- "image"
categories:
- "cloud"
status: "preview"
unlisted: true

0 comments on commit a6819a7

Please sign in to comment.