From fb15f14e16e55c98ba28a4476682cb85298e74ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:12:39 -0400 Subject: [PATCH 1/7] Bump org.testcontainers:testcontainers-bom from 1.17.3 to 1.17.6 (#2507) Bumps [org.testcontainers:testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.17.3 to 1.17.6. - [Release notes](https://github.com/testcontainers/testcontainers-java/releases) - [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md) - [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.3...1.17.6) --- updated-dependencies: - dependency-name: org.testcontainers:testcontainers-bom dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d615a740..6d92fcea 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 4.1.5-SNAPSHOT 2.18.41 v1-rev20201112-1.30.10 - 1.17.3 + 1.17.6 2.31.0 3.0.0 true From 2e2a89b9bb80986adaf5b58d6476b8a96a551eb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:21:10 -0400 Subject: [PATCH 2/7] Bump org.tmatesoft.svnkit:svnkit from 1.10.1 to 1.10.11 (#2513) Bumps org.tmatesoft.svnkit:svnkit from 1.10.1 to 1.10.11. --- updated-dependencies: - dependency-name: org.tmatesoft.svnkit:svnkit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-config-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-dependencies/pom.xml b/spring-cloud-config-dependencies/pom.xml index ee33ab3c..75ba630e 100644 --- a/spring-cloud-config-dependencies/pom.xml +++ b/spring-cloud-config-dependencies/pom.xml @@ -74,7 +74,7 @@ org.tmatesoft.svnkit svnkit - 1.10.1 + 1.10.11 From 2e184dde09d577e4f6d3d805415c4eb4c4494b1c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:23:06 -0400 Subject: [PATCH 3/7] Bump org.apache.maven.plugins:maven-jar-plugin from 3.2.0 to 3.2.2 (#2508) Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.2.0 to 3.2.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.2.0...maven-jar-plugin-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-config-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 3fcd1019..06393c47 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -255,7 +255,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.2.2 From e59f79931f9d47f2b2e979fa281c4478e9c8cbb5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:23:43 -0400 Subject: [PATCH 4/7] Bump @springio/antora-extensions from 1.11.1 to 1.14.2 in /docs (#2504) Bumps [@springio/antora-extensions](https://github.com/spring-io/antora-extensions) from 1.11.1 to 1.14.2. - [Changelog](https://github.com/spring-io/antora-extensions/blob/main/CHANGELOG.adoc) - [Commits](https://github.com/spring-io/antora-extensions/compare/v1.11.1...v1.14.2) --- updated-dependencies: - dependency-name: "@springio/antora-extensions" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index be7a0c4a..299988e9 100644 --- a/docs/package.json +++ b/docs/package.json @@ -4,7 +4,7 @@ "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", - "@springio/antora-extensions": "1.11.1", + "@springio/antora-extensions": "1.14.2", "@springio/asciidoctor-extensions": "1.0.0-alpha.10" } } From 2b82256b4f7ead5b556f3700df340de37dd79306 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:25:12 -0400 Subject: [PATCH 5/7] Bump antora from 3.2.0-alpha.4 to 3.2.0-alpha.6 in /docs (#2500) Bumps [antora](https://gitlab.com/antora/antora) from 3.2.0-alpha.4 to 3.2.0-alpha.6. - [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc) - [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-alpha.4...v3.2.0-alpha.6) --- updated-dependencies: - dependency-name: antora dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- docs/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/package.json b/docs/package.json index 299988e9..64368b8d 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "dependencies": { - "antora": "3.2.0-alpha.4", + "antora": "3.2.0-alpha.6", "@antora/atlas-extension": "1.0.0-alpha.2", "@antora/collector-extension": "1.0.0-alpha.3", "@asciidoctor/tabs": "1.0.0-beta.6", From d8c82ec15dae29d689f5c6305a2f4fb65bef69f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:29:53 -0400 Subject: [PATCH 6/7] Bump com.amazonaws:aws-java-sdk-core from 1.12.287 to 1.12.770 (#2496) Bumps [com.amazonaws:aws-java-sdk-core](https://github.com/aws/aws-sdk-java) from 1.12.287 to 1.12.770. - [Changelog](https://github.com/aws/aws-sdk-java/blob/master/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-java/compare/1.12.287...1.12.770) --- updated-dependencies: - dependency-name: com.amazonaws:aws-java-sdk-core dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- spring-cloud-config-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-config-server/pom.xml b/spring-cloud-config-server/pom.xml index 06393c47..4d1764b4 100644 --- a/spring-cloud-config-server/pom.xml +++ b/spring-cloud-config-server/pom.xml @@ -215,7 +215,7 @@ com.amazonaws aws-java-sdk-core - 1.12.287 + 1.12.770 test From 0caa87a63eceee7f652417c91c552e8034566b42 Mon Sep 17 00:00:00 2001 From: Ryan Baxter <524254+ryanjbaxter@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:17:19 -0400 Subject: [PATCH 7/7] Add note about running a Config Server in a container Fixes #2028 --- .../environment-repository/git-backend.adoc | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc b/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc index 74cfb5f1..35608a04 100644 --- a/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc +++ b/docs/modules/ROOT/pages/server/environment-repository/git-backend.adoc @@ -453,3 +453,18 @@ does not exist, the config server will by default also try to checkout a branch you would like to disable to the fallback branch behavior you can set `spring.cloud.config.server.git.tryMasterBranch` to `false`. +[[container]] +== Running The Config Server Using Git In A Container + +If you are getting a `java.io.IOException` when running the Config Server in a container that is similar to: + +``` +2022-01-03 20:04:02,892 [tributeWriter-2] ERROR org.eclipse.jgit.util.FS$FileStoreAttributes.saveToConfig - Cannot save config file 'FileBasedConfig[/.config/jgit/config]' +java.io.IOException: Creating directories for /.config/jgit failed +``` + +You must either: + +1. Provide a user with a writeable home directory inside the container. +2. Set the environment variable `XDG_CONFIG_HOME` inside the container to point to a directory where the Java process has write permissions. +