curl: do not hardcode version requirement

Signed-off-by: Sam Alba <sam.alba@gmail.com>
dagger · May 27, 2021 · f6aea7e · f6aea7e
1 parent dd17c48
commit f6aea7e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/stdlib/aws/aws.cue b/stdlib/aws/aws.cue
@@ -18,15 +18,15 @@ import (
 
 // Re-usable aws-cli component
 #CLI: {
-	package: [string]: string
+	package: [string]: string | bool
 
 	#up: [
 		op.#Load & {
 			from: alpine.#Image & {
 				"package": package
 				"package": bash:      "=~5.1"
 				"package": jq:        "=~1.6"
-				"package": curl:      "=~7.77"
+				"package": curl:      true
 				"package": "aws-cli": "=~1.18"
 			}
 		},
@@ -42,7 +42,7 @@ import (
 	code: string
 
 	// Extra pkgs to install
-	package: [string]: string
+	package: [string]: string | bool
 
 	// Files to mount
 	files: [string]: string

diff --git a/stdlib/gcp/gcloud.cue b/stdlib/gcp/gcloud.cue
@@ -9,7 +9,7 @@ import (
 #GCloud: {
 	config:  #Config
 	version: string | *"288.0.0"
-	package: [string]: string
+	package: [string]: string | bool
 
 	#up: [
 		op.#Load & {
@@ -18,7 +18,7 @@ import (
 				"package": bash:    "=~5.1"
 				"package": python3: "=~3.8"
 				"package": jq:      "=~1.6"
-				"package": curl:    "=~7.77"
+				"package": curl:    true
 			}
 		},
 

diff --git a/stdlib/kubernetes/kubernetes.cue b/stdlib/kubernetes/kubernetes.cue
@@ -22,7 +22,7 @@ import (
 			from: alpine.#Image & {
 				package: bash: "=~5.1"
 				package: jq:   "=~1.6"
-				package: curl: "=~7.77"
+				package: curl: true
 			}
 		},
 		op.#WriteFile & {

diff --git a/stdlib/kubernetes/kustomize/kustomization.cue b/stdlib/kubernetes/kustomize/kustomization.cue
@@ -21,7 +21,7 @@ import (
 			from: alpine.#Image & {
 				package: bash: "=~5.1"
 				package: jq:   "=~1.6"
-				package: curl: "=~7.77"
+				package: curl: true
 			}
 		},
 

diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue
@@ -62,7 +62,7 @@ import (
 			package: {
 				bash: "=~5.1"
 				jq:   "=~1.6"
-				curl: "=~7.77"
+				curl: true
 				yarn: "=~1.22"
 			}
 		}

diff --git a/tests/stdlib/alpine/alpine.cue b/tests/stdlib/alpine/alpine.cue
@@ -28,7 +28,7 @@ TestImageVersion: {
 TestPackageInstall: {
 	image: alpine.#Image & {
 		package: jq:   true
-		package: curl: "=~7.77"
+		package: curl: true
 		version: "3.13"
 	}
 
@@ -38,7 +38,7 @@ TestPackageInstall: {
 			args: ["jq", "--version"]
 		},
 		op.#Exec & {
-			args: ["sh", "-ec", "curl --version | grep -q 7.76"]
+			args: ["sh", "-ec", "curl --version"]
 		},
 	]
 }
diff --git a/tests/stdlib/netlify/netlify.cue b/tests/stdlib/netlify/netlify.cue
@@ -26,7 +26,7 @@ TestNetlify: {
 		op.#Load & {
 			from: alpine.#Image & {
 				package: bash: "=~5.1"
-				package: curl: "=~7.77"
+				package: curl: true
 			}
 		},
 		op.#Exec & {