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

Jump to bottom

Improve error message about global Jib config and update CHANGELOGs #3144

Merged
merged 3 commits into from
Mar 17, 2021
+11 −3
Merged

Improve error message about global Jib config and update CHANGELOGs #3144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2e07dbd
Update missing CHANGELOG entries
chanseokoh Mar 16, 2021
764a1af
wording
chanseokoh Mar 16, 2021
52460a9
Update error message
chanseokoh Mar 16, 2021
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 jib-gradle-plugin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ All notable changes to this project will be documented in this file.

- Added support for [configuring registry mirrors](https:/GoogleContainerTools/jib/blob/master/docs/faq.md#i-am-hitting-docker-hub-rate-limits-how-can-i-configure-registry-mirrors) for base images. This is useful when hitting [Docker Hub rate limits](https://www.docker.com/increase-rate-limits). Only public mirrors (such as `mirror.gcr.io`) are supported. ([#3011](https:/GoogleContainerTools/jib/issues/3011))

### Changed

- Build will fail if Jib cannot create or read the [global Jib configuration file](https:/GoogleContainerTools/jib/tree/master/jib-gradle-plugin#global-jib-configuration). ([#2996](https:/GoogleContainerTools/jib/pull/2996))
chanseokoh marked this conversation as resolved.
Show resolved Hide resolved

## 2.7.1

### Fixed
Expand Down
4 changes: 4 additions & 0 deletions jib-maven-plugin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ All notable changes to this project will be documented in this file.

- Added support for [configuring registry mirrors](https:/GoogleContainerTools/jib/blob/master/docs/faq.md#i-am-hitting-docker-hub-rate-limits-how-can-i-configure-registry-mirrors) for base images. This is useful when hitting [Docker Hub rate limits](https://www.docker.com/increase-rate-limits). Only public mirrors (such as `mirror.gcr.io`) are supported. ([#3011](https:/GoogleContainerTools/jib/issues/3011))

### Changed

- Build will fail if Jib cannot create or read the [global Jib configuration file](https:/GoogleContainerTools/jib/tree/master/jib-maven-plugin#global-jib-configuration). ([#2996](https:/GoogleContainerTools/jib/pull/2996))

## 2.7.1

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion ...on/src/main/java/com/google/cloud/tools/jib/plugins/common/globalconfig/GlobalConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static GlobalConfig readConfig(Path configDir) throws IOException, InvalidGlobal

} catch (IOException ex) {
throw new IOException(
"Failed to open or parse global Jib config file; see "
"Failed to create, open, or parse global Jib config file; see "
+ "https:/GoogleContainerTools/jib/blob/master/docs/faq.md#where-is-the-global-jib-configuration-file-and-how-i-can-configure-it "
+ "to fix or you may need to delete "
+ configFile,
Expand Down
4 changes: 2 additions & 2 deletions ...rc/test/java/com/google/cloud/tools/jib/plugins/common/globalconfig/GlobalConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public void testReadConfig_emptyFile() throws IOException {
assertThat(exception)
.hasMessageThat()
.startsWith(
"Failed to open or parse global Jib config file; see "
"Failed to create, open, or parse global Jib config file; see "
+ "https:/GoogleContainerTools/jib/blob/master/docs/faq.md#where-is-the-global-jib-configuration-file-and-how-i-can-configure-it "
+ "to fix or you may need to delete");
assertThat(exception).hasMessageThat().endsWith(File.separator + "config.json");
Expand All @@ -125,7 +125,7 @@ public void testReadConfig_corrupted() throws IOException {
assertThat(exception)
.hasMessageThat()
.startsWith(
"Failed to open or parse global Jib config file; see "
"Failed to create, open, or parse global Jib config file; see "
+ "https:/GoogleContainerTools/jib/blob/master/docs/faq.md#where-is-the-global-jib-configuration-file-and-how-i-can-configure-it "
+ "to fix or you may need to delete ");
assertThat(exception).hasMessageThat().endsWith(File.separator + "config.json");
Expand Down