From dd17c48922405c7e0111c935e5a1b4d1b37e2632 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Thu, 27 May 2021 13:59:47 +0200 Subject: [PATCH 1/2] increased curl dependency, 7.76 was removed from alpine pkg repo Signed-off-by: Sam Alba --- stdlib/aws/aws.cue | 2 +- stdlib/gcp/gcloud.cue | 2 +- stdlib/kubernetes/kubernetes.cue | 2 +- stdlib/kubernetes/kustomize/kustomization.cue | 2 +- stdlib/netlify/netlify.cue | 2 +- tests/stdlib/alpine/alpine.cue | 2 +- tests/stdlib/netlify/netlify.cue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stdlib/aws/aws.cue b/stdlib/aws/aws.cue index 9a3be0ff..2c438f92 100644 --- a/stdlib/aws/aws.cue +++ b/stdlib/aws/aws.cue @@ -26,7 +26,7 @@ import ( "package": package "package": bash: "=~5.1" "package": jq: "=~1.6" - "package": curl: "=~7.76" + "package": curl: "=~7.77" "package": "aws-cli": "=~1.18" } }, diff --git a/stdlib/gcp/gcloud.cue b/stdlib/gcp/gcloud.cue index 4a348991..1d277f98 100644 --- a/stdlib/gcp/gcloud.cue +++ b/stdlib/gcp/gcloud.cue @@ -18,7 +18,7 @@ import ( "package": bash: "=~5.1" "package": python3: "=~3.8" "package": jq: "=~1.6" - "package": curl: "=~7.76" + "package": curl: "=~7.77" } }, diff --git a/stdlib/kubernetes/kubernetes.cue b/stdlib/kubernetes/kubernetes.cue index 6633b5ed..7b7f8191 100644 --- 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.76" + package: curl: "=~7.77" } }, op.#WriteFile & { diff --git a/stdlib/kubernetes/kustomize/kustomization.cue b/stdlib/kubernetes/kustomize/kustomization.cue index dc7e6b93..af6cf86a 100644 --- 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.76" + package: curl: "=~7.77" } }, diff --git a/stdlib/netlify/netlify.cue b/stdlib/netlify/netlify.cue index d9618e9d..ec0cb314 100644 --- a/stdlib/netlify/netlify.cue +++ b/stdlib/netlify/netlify.cue @@ -62,7 +62,7 @@ import ( package: { bash: "=~5.1" jq: "=~1.6" - curl: "=~7.76" + curl: "=~7.77" yarn: "=~1.22" } } diff --git a/tests/stdlib/alpine/alpine.cue b/tests/stdlib/alpine/alpine.cue index 19a100d4..48d1027d 100644 --- 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.76" + package: curl: "=~7.77" version: "3.13" } diff --git a/tests/stdlib/netlify/netlify.cue b/tests/stdlib/netlify/netlify.cue index f84a27da..da8d0c9c 100644 --- 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.76" + package: curl: "=~7.77" } }, op.#Exec & { From f6aea7e529cb8d0d575406b3dcfdf4b1071667f6 Mon Sep 17 00:00:00 2001 From: Sam Alba Date: Thu, 27 May 2021 14:20:15 +0200 Subject: [PATCH 2/2] curl: do not hardcode version requirement Signed-off-by: Sam Alba --- stdlib/aws/aws.cue | 6 +++--- stdlib/gcp/gcloud.cue | 4 ++-- stdlib/kubernetes/kubernetes.cue | 2 +- stdlib/kubernetes/kustomize/kustomization.cue | 2 +- stdlib/netlify/netlify.cue | 2 +- tests/stdlib/alpine/alpine.cue | 4 ++-- tests/stdlib/netlify/netlify.cue | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/stdlib/aws/aws.cue b/stdlib/aws/aws.cue index 2c438f92..c8e8d0f4 100644 --- a/stdlib/aws/aws.cue +++ b/stdlib/aws/aws.cue @@ -18,7 +18,7 @@ import ( // Re-usable aws-cli component #CLI: { - package: [string]: string + package: [string]: string | bool #up: [ op.#Load & { @@ -26,7 +26,7 @@ import ( "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 index 1d277f98..4550990a 100644 --- 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 index 7b7f8191..5d01cadb 100644 --- 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 index af6cf86a..bcf02a10 100644 --- 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 index ec0cb314..61e23f06 100644 --- 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 index 48d1027d..b5dc0b9d 100644 --- 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 index da8d0c9c..1511f15f 100644 --- 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 & {