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

refactor: Replace Quarkus Native Base image with ubi-minimal (same as… #252

Merged
merged 1 commit into from
Jun 19, 2020
Merged

refactor: Replace Quarkus Native Base image with ubi-minimal (same as… #252

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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ Usage:
./scripts/extract-changelog-for-version.sh 1.3.37 5
```
### 1.0.0-SNAPSHOT
* Fix #252: Replace Quarkus Native Base image with ubi-minimal (same as in `Dockerfile.native`)
* Fix #187: Provided Dockerfile is always skipped in simple Dockerfile mode
* Fix #237: Remove deprecated fields and method calls
* Fix #192: Removed `@Deprecated` fields from ClusterAccess
* Fix #190: Removed `@Deprecated` fields from AssemblyConfiguration
* Fix #189: Removed `@Deprecated` fields from BuildConfiguration


### 1.0.0-alpha-4 (2020-06-08)
* Fix #173: Use OpenShift compliant git/vcs annotations
* Fix #182: Assembly is never null
Expand Down
2 changes: 1 addition & 1 deletion ...jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/generator/QuarkusGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ private BuildConfiguration createBuildConfig(boolean prePackagePhase) {

Optional<String> fromConfigured = Optional.ofNullable(getFromAsConfigured());
if (isNative) {
buildBuilder.from(fromConfigured.orElse("registry.fedoraproject.org/fedora-minimal"))
buildBuilder.from(fromConfigured.orElse("registry.access.redhat.com/ubi8/ubi-minimal:8.1"))
.entryPoint(Arguments.builder()
.execArgument("./" + findSingleFileThatEndsWith("-runner"))
.execArgument("-Dquarkus.http.host=0.0.0.0")
Expand Down
11 changes: 3 additions & 8 deletions ...e-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@
*/
public class QuarkusGeneratorTest {

private static final String QUARKUS_GROUP = "io.quarkus";
private static final String QUARKUS_MAVEN_PLUGIN = "quarkus-maven-plugin";

private static final String BASE_JAVA_IMAGE = "java:latest";
private static final String BASE_NATIVE_IMAGE = "fedora:latest";

Expand All @@ -69,7 +66,6 @@ public void setUp() throws IOException {
project.getBuildDirectory(); result = new File("target/tmp").getAbsolutePath();
// project.getPlugin(QUARKUS_GROUP + ":" + QUARKUS_MAVEN_PLUGIN); result = quarkusPlugin;
}};

// @formatter:on
projectProps.put("jkube.generator.name", "quarkus");
setupContextOpenShift(projectProps, null, null);
Expand All @@ -78,12 +74,11 @@ public void setUp() throws IOException {
@Test
public void testCustomizeReturnsDefaultFrom () {
QuarkusGenerator generator = new QuarkusGenerator(ctx);
List<ImageConfiguration> resultImages = null;
List<ImageConfiguration> existingImages = new ArrayList<>();

resultImages = generator.customize(existingImages, true);
final List<ImageConfiguration> result = generator.customize(existingImages, true);

assertBuildFrom(resultImages, "openjdk:11");
assertBuildFrom(result, "openjdk:11");
}

@Test
Expand All @@ -96,7 +91,7 @@ public void testCustomizeReturnsDefaultFromWhenNative () throws IOException {

resultImages = generator.customize(existingImages, true);

assertBuildFrom(resultImages, "registry.fedoraproject.org/fedora-minimal");
assertBuildFrom(resultImages, "registry.access.redhat.com/ubi8/ubi-minimal:8.1");
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion kubernetes-maven-plugin/doc/src/main/asciidoc/inc/generator/_quarkus.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The base images chosen are:
| | Docker Build | S2I Build

| *Native*
| `registry.fedoraproject.org/fedora-minimal`
| `registry.access.redhat.com/ubi8/ubi-minimal:8.1`
| ---

| *Normal Build*
Expand Down