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

Port packages to latest versions + update netlify to latest CLI version + update aws to latest version

Browse Source 
Signed-off-by: guillaume <guillaume.derouville@gmail.com>
This commit is contained in:
guillaume 2022-01-04 15:27:33 +01:00
parent 80a21cd6ea
commit bd4916873b
28 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/reference/aws/README.md
View File

@ -20,7 +20,7 @@ import "alpha.dagger.io/aws"
|*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode | |*config.localMode* | `*false \| bool` |AWS localstack mode |
|*version* | `*"1.18" \| string` |- | |*version* | `*"1.19" \| string` |- |
### aws.#CLI Outputs ### aws.#CLI Outputs
@ -55,7 +55,7 @@ Configuration specific to CLI v1
|*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode | |*config.localMode* | `*false \| bool` |AWS localstack mode |
|*version* | `*"1.18" \| string` |- | |*version* | `*"1.19" \| string` |- |
### aws.#V1 Outputs ### aws.#V1 Outputs
@ -73,7 +73,7 @@ Configuration specific to CLI v2
|*config.accessKey* | `dagger.#Secret` |AWS access key | |*config.accessKey* | `dagger.#Secret` |AWS access key |
|*config.secretKey* | `dagger.#Secret` |AWS secret key | |*config.secretKey* | `dagger.#Secret` |AWS secret key |
|*config.localMode* | `*false \| bool` |AWS localstack mode | |*config.localMode* | `*false \| bool` |AWS localstack mode |
|*version* | `*"2.1.27" \| string` |- | |*version* | `*"2.1.29" \| string` |- |
### aws.#V2 Outputs ### aws.#V2 Outputs

2
docs/reference/aws/ecr.md
View File

@ -26,7 +26,7 @@ Convert ECR credentials to Docker Login format
|*ctr.image.config.accessKey* | `dagger.#Secret` |AWS access key | |*ctr.image.config.accessKey* | `dagger.#Secret` |AWS access key |
|*ctr.image.config.secretKey* | `dagger.#Secret` |AWS secret key | |*ctr.image.config.secretKey* | `dagger.#Secret` |AWS secret key |
|*ctr.image.config.localMode* | `*false \| bool` |AWS localstack mode | |*ctr.image.config.localMode* | `*false \| bool` |AWS localstack mode |
|*ctr.image.version* | `*"1.18" \| string` |- | |*ctr.image.version* | `*"1.19" \| string` |- |
### ecr.#Credentials Outputs ### ecr.#Credentials Outputs

2
stdlib/alpine/alpine.cue
View File

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

4
stdlib/argocd/argocd.cue
View File

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

14
stdlib/aws/aws.cue
View File

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

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

@ -64,7 +64,7 @@ import (
test: #up: [ test: #up: [
op.#Load & { op.#Load & {
from: alpine.#Image & { 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 & { ctr: os.#Container & {
image: alpine.#Image & { image: alpine.#Image & {
package: curl: true package: curl: true
package: bash: "~=5.1" package: bash: true
package: jq: "~=1.6" package: jq: true
package: npm: true package: npm: true
package: git: true package: git: true
} }

10
stdlib/gcp/gcloud.cue
View File

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

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

@ -64,7 +64,7 @@ import (
test: #up: [ test: #up: [
op.#Load & { op.#Load & {
from: alpine.#Image & { 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 secret not found
if [[ ! "${status}" -eq 0 ]]; then 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 \ && cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \
) || (echo "Error while creating secret ${FILE##*/}" >&2 && exit 1) ) || (echo "Error while creating secret ${FILE##*/}" >&2 && exit 1)
BOOL=1 BOOL=1
else 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 \ && cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \
) || (echo "Error while updating secret ${FILE##*/}" >&2 && exit 1) ) || (echo "Error while updating secret ${FILE##*/}" >&2 && exit 1)
BOOL=1 BOOL=1
fi fi
if [ $BOOL -eq 0 ]; then 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 \ && cat <<< $(cat /tmp/output.json | jq ".|.\"${FILE##*/}\"=\"$RES\"") > /tmp/output.json \
) || (echo "Error while retrieving secret ${FILE##*/}" >&2 && exit 1) ) || (echo "Error while retrieving secret ${FILE##*/}" >&2 && exit 1)
fi fi

12
stdlib/git/git.cue
View File

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

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

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

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

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

6
stdlib/http/http.cue
View File

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

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

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

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

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

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

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

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

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

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

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

4
stdlib/kubernetes/kubernetes.cue
View File

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

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

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

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

@ -12,7 +12,7 @@ import (
#up: [ #up: [
op.#Load & { op.#Load & {
from: alpine.#Image & { 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 & { ctr: os.#Container & {
image: alpine.#Image & { image: alpine.#Image & {
package: { package: {
bash: "=~5.1" bash: true
jq: "=~1.6" jq: true
curl: true curl: true
yarn: "=~1.22" yarn: true
} }
} }
setup: [ setup: [
"yarn global add netlify-cli@3.38.10", "yarn global add netlify-cli@8.6.1",
] ]
// set in netlify.sh.cue // set in netlify.sh.cue
// FIXME: use embedding once cue supports it // FIXME: use embedding once cue supports it

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

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

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

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

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

@ -17,9 +17,9 @@ EmptyDir: {
Read: { Read: {
f: #File & { f: #File & {
from: alpine.#Image & { from: alpine.#Image & {
version: "3.13.4" version: "3.15.0"
} }
path: "/etc/alpine-release" 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: [ #up: [
op.#Load & {from: alpine.#Image & { op.#Load & {from: alpine.#Image & {
package: python3: "=~3.8" package: python3: true
}}, }},
op.#WriteFile & { op.#WriteFile & {

4
stdlib/trivy/trivy.cue
View File

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