Merge branch 'main' into clickhouse-module

testcontainers · Aug 9, 2023 · abcac8a · abcac8a
2 parents 3f27bf3 + 86f6a27
commit abcac8a
Show file tree

Hide file tree

Showing 20 changed files with 953 additions and 60 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,14 +8,14 @@ updates:
         day: sunday
       open-pull-requests-limit: 3
       rebase-strategy: disabled
-    - package-ecosystem: pip
+    - package-ecosystem: gomod
       directory: /
       schedule:
         interval: monthly
         day: sunday
       open-pull-requests-limit: 3
       rebase-strategy: disabled
-    - package-ecosystem: gomod
+    - package-ecosystem: pip
       directory: /
       schedule:
         interval: monthly

diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
@@ -0,0 +1,15 @@
+# https://github.com/release-drafter/release-drafter
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@65c5fb495d1e69aa8c08a3317bc44ff8aabe9772 # v5.19.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/docker_auth.go b/docker_auth.go
@@ -81,6 +81,17 @@ func getDockerAuthConfigs() (map[string]registry.AuthConfig, error) {
 		cfgs[k] = ac
 	}
 
+	// in the case where the auth field in the .docker/conf.json is empty, and the user has credential helpers registered
+	// the auth comes from there
+	for k := range cfg.CredentialHelpers {
+		ac := registry.AuthConfig{}
+		u, p, _ := dockercfg.GetRegistryCredentials(k)
+		ac.Username = u
+		ac.Password = p
+
+		cfgs[k] = ac
+	}
+
 	return cfgs, nil
 }
 
@@ -96,7 +107,6 @@ func getDockerConfig() (dockercfg.Config, error) {
 		if err == nil {
 			return cfg, nil
 		}
-
 	}
 
 	cfg, err := dockercfg.LoadDefaultConfig()

diff --git a/docs/css/extra.css b/docs/css/extra.css
@@ -1,13 +1,18 @@
-@import url('https://fonts.googleapis.com/css?family=Rubik');
 h1, h2, h3, h4, h5, h6 {
     font-family: 'Rubik', sans-serif;
-
 }
 
 [data-md-color-scheme="testcontainers"] {
-    --md-primary-fg-color:       #291A3F;
-    --md-accent-fg-color:        #291A3F;
+    --md-primary-fg-color:       #00bac2;
+    --md-accent-fg-color:        #361E5B;
     --md-typeset-a-color:        #0C94AA;
+    --md-primary-fg-color--dark: #291A3F;
+    --md-default-fg-color--lightest: #F2F4FE;
+    --md-footer-fg-color: #361E5B;
+    --md-footer-fg-color--light: #746C8F;
+    --md-footer-fg-color--lighter: #C3BEDE;
+    --md-footer-bg-color: #F7F9FD;
+    --md-footer-bg-color--dark: #F7F9FD;
 }
 
 .card-grid {
@@ -45,14 +50,14 @@ body .card-grid-item:focus {
 }
 
 .card-grid-item[href] {
-    color: var(--md-primary-fg-color);
+    color: var(--md-primary-fg-color--dark);
     background: transparent;
 }
 
 .card-grid-item[href]:hover,
 .card-grid-item[href]:focus {
     background: #F2F4FE;
-    color: var(--md-primary-fg-color);
+    color: var(--md-primary-fg-color--dark);
 }
 
 .community-callout-wrapper {
@@ -120,4 +125,4 @@ body .card-grid-item:focus {
     .community-callout a img {
         height: 1.75em;
     }
-}
+}