Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: container-image-s2i runtime dependencies #7606

Merged
merged 1 commit into from
Mar 5, 2020
Merged

fix: container-image-s2i runtime dependencies #7606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions extensions/container-image/container-image-s2i/deployment/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-spi</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-spi</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions ...-s2i/deployment/src/main/java/io/quarkus/container/image/s2i/deployment/S2iProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class S2iProcessor {

private static final Logger LOG = Logger.getLogger(S2iProcessor.class);

@BuildStep(onlyIf = S2iBuild.class, onlyIfNot = NativeBuild.class)
@BuildStep(onlyIf = { IsNormal.class, S2iBuild.class }, onlyIfNot = NativeBuild.class)
public void s2iRequirementsJvm(S2iConfig s2iConfig,
CurateOutcomeBuildItem curateOutcomeBuildItem,
OutputTargetBuildItem out,
Expand All @@ -97,7 +97,7 @@ public void s2iRequirementsJvm(S2iConfig s2iConfig,
commandProducer.produce(new KubernetesCommandBuildItem("java", args.toArray(new String[args.size()])));
}

@BuildStep(onlyIf = { S2iBuild.class, NativeBuild.class })
@BuildStep(onlyIf = { IsNormal.class, S2iBuild.class, NativeBuild.class })
public void s2iRequirementsNative(S2iConfig s2iConfig,
CurateOutcomeBuildItem curateOutcomeBuildItem,
OutputTargetBuildItem out,
Expand Down
7 changes: 7 additions & 0 deletions extensions/container-image/container-image-s2i/runtime/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@
<name>Quarkus - Container - Image - S2I</name>
<description>Build container images of your application using OpenShift S2I</description>

<dependencies>
<!-- We need the config to be on the runtime classpath because it's referenced from the config generation -->
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-kubernetes-client-internal</artifactId>
</dependency>
</dependencies>

<build>
<plugins>
Expand Down