kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1331 from grouville/update/alpine-version

Browse Source 
Update/alpine version to 3.15.0
This commit is contained in:
Sam Alba
2022-01-04 14:14:47 -08:00
committed by GitHub
parent 5419f4c89b bd4916873b
commit 2e072ea08a
32 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
stdlib/alpine/alpine.cue
View File

@@ -6,7 +6,7 @@ import (
)
// Default Alpine version
let defaultVersion = "3.13.5@sha256:69e70a79f2d41ab5d637de98c1e0b055206ba40a8145e7bddb55ccc04e13cf8f"
let defaultVersion = "3.15.0@sha256:e7d88de73db3d3fd9b2d63aa7f447a10fd0220b7cbf39803c803f2af9ba256b3"
// Base image for Alpine Linux
#Image: {

2
stdlib/alpine/tests/alpine.cue
View File

@@ -28,7 +28,7 @@ TestPackageInstall: {
image: #Image & {
package: jq: true
package: curl: true
version: "3.13"
version: "3.15.0"
}
test: #up: [

4
stdlib/argocd/argocd.cue
View File

@@ -38,8 +38,8 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: jq: "=~1.6"
package: bash: true
package: jq: true
package: curl: true
}
},

14
stdlib/aws/aws.cue
View File

@@ -24,14 +24,14 @@ import (
#V1: {
config: #Config
package: [string]: string | bool
version: dagger.#Input & {*"1.18" | string}
version: dagger.#Input & {*"1.19" | string}
#up: [
op.#Load & {
from: alpine.#Image & {
"package": package
"package": bash: "=~5.1"
"package": jq: "=~1.6"
"package": bash: true
"package": jq: true
"package": curl: true
"package": "aws-cli": "=~\( version )"
if config.localMode != false {
@@ -47,14 +47,14 @@ import (
#V2: {
config: #Config
package: [string]: string | bool
version: dagger.#Input & {*"2.1.27" | string}
version: dagger.#Input & {*"2.1.29" | string}
#up: [
op.#Load & {
from: alpine.#Image & {
"package": package
"package": bash: "=~5.1"
"package": jq: "=~1.6"
"package": bash: true
"package": jq: true
"package": curl: true
"package": binutils: true
if config.localMode != false {
@@ -87,7 +87,7 @@ import (
#CLI: {
config: #Config
package: [string]: string | bool
version: dagger.#Input & {*"1.18" | string}
version: dagger.#Input & {*"1.19" | string}
_isV2: regexp.Match("^2.*$", version)

2
stdlib/aws/s3/tests/verify.cue
View File

@@ -64,7 +64,7 @@ import (
test: #up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "~5.1"
package: bash: true
}
},

4
stdlib/bats/bats.cue
View File

@@ -35,8 +35,8 @@ import (
ctr: os.#Container & {
image: alpine.#Image & {
package: curl: true
package: bash: "~=5.1"
package: jq: "~=1.6"
package: bash: true
package: jq: true
package: npm: true
package: git: true
}

10
stdlib/gcp/gcloud.cue
View File

@@ -8,21 +8,21 @@ import (
// Re-usable gcloud component
#GCloud: {
config: #Config
version: string | *"288.0.0"
version: string | *"366.0.0"
package: [string]: string | bool
#up: [
op.#Load & {
from: alpine.#Image & {
"package": package
"package": bash: "=~5.1"
"package": python3: "=~3.8"
"package": jq: "=~1.6"
"package": bash: true
"package": python3: true
"package": jq: true
"package": curl: true
}
},
// Install the gcloud cli
// Install the gcloud cli
op.#Exec & {
args: ["sh", "-c",
#"""

2
stdlib/gcp/gcs/tests/verify.cue
View File

@@ -64,7 +64,7 @@ import (
test: #up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "~5.1"
package: bash: true
}
},

6
stdlib/gcp/secretmanager/secrets.cue
View File

@@ -37,20 +37,20 @@ import (
# If secret not found
if [[ ! "${status}" -eq 0 ]]; then
(\
RES=$(gcloud secrets create "${FILE##*/}" --replication-policy automatic --data-file "${FILE}" --format='value(name)' | sed -n '1!p') \
RES="$(gcloud secrets create "${FILE##*/}" --replication-policy automatic --data-file "${FILE}" --format='value(name)' 2>&1 | sed -n '1!p')" \
&& cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \
) || (echo "Error while creating secret ${FILE##*/}" >&2 && exit 1)
BOOL=1
else
(\
RES=$(gcloud secrets versions add "${FILE##*/}" --data-file "${FILE}" --format='value(name)' | sed -n '1!p') \
RES="$(gcloud secrets versions add "${FILE##*/}" --data-file "${FILE}" --format='value(name)' 2>&1 | sed -n '1!p')" \
&& cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \
) || (echo "Error while updating secret ${FILE##*/}" >&2 && exit 1)
BOOL=1
fi
if [ $BOOL -eq 0 ]; then
(\
RES=$(gcloud secrets describe "${FILE##*/}" --format='value(name)') \
RES="$(gcloud secrets describe "${FILE##*/}" --format='value(name)' 2>&1)" \
&& cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \
) || (echo "Error while retrieving secret ${FILE##*/}" >&2 && exit 1)
fi

12
stdlib/git/git.cue
View File

@@ -31,7 +31,7 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: git: "=~2.30"
package: git: true
}
},
op.#Copy & {
@@ -91,8 +91,8 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: git: "=~2.30"
package: bash: true
package: git: true
}
},
@@ -132,9 +132,9 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: jq: "=~1.6"
package: git: "=~2.30"
package: bash: true
package: jq: true
package: git: true
}
},

12
stdlib/git/tests/git/git.cue
View File

@@ -31,7 +31,7 @@ tagsList: #Tags & {
TestRepository: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
package: git: true
}
mount: "/repo1": from: repo
@@ -43,7 +43,7 @@ TestRepository: os.#Container & {
TestSubRepository: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
package: git: true
}
mount: "/repo1": from: repoSubDir
@@ -55,7 +55,7 @@ TestSubRepository: os.#Container & {
TestCurrentBranch: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
package: git: true
}
env: BRANCH_NAME: branch.name
@@ -66,7 +66,7 @@ TestCurrentBranch: os.#Container & {
TestCurrentTags: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
package: git: true
}
env: TAGS: strings.Join([ for k, v in tagsList.tags {"\(k)=\(v)"}], "\n")
@@ -87,7 +87,7 @@ privateRepo: #Repository & {
TestPrivateRepository: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
package: git: true
}
mount: "/repo1": from: privateRepo
@@ -99,7 +99,7 @@ TestPrivateRepository: os.#Container & {
TestReferenceFormat: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
package: git: true
}
mount: "/repo1": from: privateRepo

2
stdlib/graphql/tests/graphql.cue
View File

@@ -39,7 +39,7 @@ TestQuery: {
testRaw: os.#Container & {
image: alpine.#Image & {
package: jq: "~=1.6"
package: jq: true
}
env: STATUS: "\(queryWithoutToken.post.response.statusCode)"
shell: args: ["--noprofile", "--norc", "-eo", "pipefail", "-c"]

6
stdlib/http/http.cue
View File

@@ -27,8 +27,8 @@ import (
ctr: os.#Container & {
image: alpine.#Image & {
package: curl: true
package: bash: "=5.1.0-r0"
package: jq: "~=1.6"
package: bash: true
package: jq: true
}
shell: path: "/bin/bash"
always: true
@@ -109,7 +109,7 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: bash: true
package: curl: true
}
},

4
stdlib/http/tests/http.cue
View File

@@ -28,7 +28,7 @@ Testhealth: #Wait & {
TestWait: query: os.#Container & {
image: alpine.#Image & {
package: bash: "=~5.1"
package: bash: true
package: curl: true
}
command: #"""
@@ -44,7 +44,7 @@ TestRequest: {
testRaw: os.#Container & {
image: alpine.#Image & {
package: jq: "~=1.6"
package: jq: true
package: bash: true
}
env: STATUS: "\(req.response.statusCode)"

6
stdlib/java/maven/maven.cue
View File

@@ -40,9 +40,9 @@ import (
ctr: os.#Container & {
image: alpine.#Image & {
"package": package & {
bash: "=~5.1"
openjdk11: "=~11.0.9"
maven: "=~3.6.3"
bash: true
openjdk11: true
maven: true
}
}
shell: path: "/bin/bash"

2
stdlib/java/maven/tests/maven.cue
View File

@@ -32,7 +32,7 @@ TestSpringBoot: {
test: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
}
copy: "/build": from: project.build
command: """

4
stdlib/js/yarn/tests/yarn.cue
View File

@@ -15,7 +15,7 @@ TestReact: {
test: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
}
mount: "/build": from: pkg.build
command: """
@@ -42,7 +42,7 @@ TestSecretsAndFile: {
test: os.#Container & {
image: alpine.#Image & {
package: bash: "=5.1.0-r0"
package: bash: true
}
shell: path: "/bin/bash"
mount: "/build": from: pkg.build

4
stdlib/js/yarn/yarn.cue
View File

@@ -53,8 +53,8 @@ import (
ctr: os.#Container & {
image: alpine.#Image & {
"package": package & {
bash: "=~5.1"
yarn: "=~1.22"
bash: true
yarn: true
}
}
shell: path: "/bin/bash"

4
stdlib/kubernetes/kubernetes.cue
View File

@@ -23,8 +23,8 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: jq: "=~1.6"
package: bash: true
package: jq: true
package: curl: true
}
},

4
stdlib/kubernetes/kustomize/kustomization.cue
View File

@@ -20,8 +20,8 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: jq: "=~1.6"
package: bash: true
package: jq: true
package: curl: true
}
},

2
stdlib/kubernetes/kustomize/tests/verify.cue
View File

@@ -12,7 +12,7 @@ import (
#up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: bash: true
}
},

8
stdlib/netlify/netlify.cue
View File

@@ -61,14 +61,14 @@ import (
ctr: os.#Container & {
image: alpine.#Image & {
package: {
bash: "=~5.1"
jq: "=~1.6"
bash: true
jq: true
curl: true
yarn: "=~1.22"
yarn: true
}
}
setup: [
"yarn global add netlify-cli@3.38.10",
"yarn global add netlify-cli@8.6.1",
]
// set in netlify.sh.cue
// FIXME: use embedding once cue supports it

6
stdlib/netlify/netlify.sh.cue
View File

@@ -44,9 +44,9 @@ package netlify
--prod \
| tee /tmp/stdout
url=$(</tmp/stdout sed -n -e 's/^Website URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
deployUrl=$(</tmp/stdout sed -n -e 's/^Unique Deploy URL:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
logsUrl=$(</tmp/stdout sed -n -e 's/^Logs:.*\(https:\/\/.*\)$/\1/p' | tr -d '\n')
url="$(cat /tmp/stdout | grep Website | grep -Eo 'https://[^ >]+' | head -1)"
deployUrl="$(cat /tmp/stdout | grep Unique | grep -Eo 'https://[^ >]+' | head -1)"
logsUrl="$(cat /tmp/stdout | grep Logs | grep -Eo 'https://[^ >]+' | head -1)"
# Write output files
mkdir -p /netlify

2
stdlib/netlify/tests/netlify.cue
View File

@@ -29,7 +29,7 @@ TestNetlify: {
check: #up: [
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: bash: true
package: curl: true
}
},

4
stdlib/os/tests/os/os.cue
View File

@@ -17,9 +17,9 @@ EmptyDir: {
Read: {
f: #File & {
from: alpine.#Image & {
version: "3.13.4"
version: "3.15.0"
}
path: "/etc/alpine-release"
}
f: contents: "3.13.4\n"
f: contents: "3.15.0\n"
}

2
stdlib/random/string.cue
View File

@@ -25,7 +25,7 @@ import (
#up: [
op.#Load & {from: alpine.#Image & {
package: python3: "=~3.8"
package: python3: true
}},
op.#WriteFile & {

4
stdlib/trivy/trivy.cue
View File

@@ -45,9 +45,9 @@ import (
if config.awsAuth == null && config.gcpAuth == null {
op.#Load & {
from: alpine.#Image & {
package: bash: "=~5.1"
package: bash: true
package: curl: true
package: jq: "=~1.6"
package: jq: true
}
}
},