Merge pull request #1331 from grouville/update/alpine-version
Update/alpine version to 3.15.0
This commit is contained in:
commit
2e072ea08a
@ -20,7 +20,7 @@ import "alpha.dagger.io/aws"
|
||||
|*config.accessKey* | `dagger.#Secret` |AWS access key |
|
||||
|*config.secretKey* | `dagger.#Secret` |AWS secret key |
|
||||
|*config.localMode* | `*false \| bool` |AWS localstack mode |
|
||||
|*version* | `*"1.18" \| string` |- |
|
||||
|*version* | `*"1.19" \| string` |- |
|
||||
|
||||
### aws.#CLI Outputs
|
||||
|
||||
@ -55,7 +55,7 @@ Configuration specific to CLI v1
|
||||
|*config.accessKey* | `dagger.#Secret` |AWS access key |
|
||||
|*config.secretKey* | `dagger.#Secret` |AWS secret key |
|
||||
|*config.localMode* | `*false \| bool` |AWS localstack mode |
|
||||
|*version* | `*"1.18" \| string` |- |
|
||||
|*version* | `*"1.19" \| string` |- |
|
||||
|
||||
### aws.#V1 Outputs
|
||||
|
||||
@ -73,7 +73,7 @@ Configuration specific to CLI v2
|
||||
|*config.accessKey* | `dagger.#Secret` |AWS access key |
|
||||
|*config.secretKey* | `dagger.#Secret` |AWS secret key |
|
||||
|*config.localMode* | `*false \| bool` |AWS localstack mode |
|
||||
|*version* | `*"2.1.27" \| string` |- |
|
||||
|*version* | `*"2.1.29" \| string` |- |
|
||||
|
||||
### aws.#V2 Outputs
|
||||
|
||||
|
@ -26,7 +26,7 @@ Convert ECR credentials to Docker Login format
|
||||
|*ctr.image.config.accessKey* | `dagger.#Secret` |AWS access key |
|
||||
|*ctr.image.config.secretKey* | `dagger.#Secret` |AWS secret key |
|
||||
|*ctr.image.config.localMode* | `*false \| bool` |AWS localstack mode |
|
||||
|*ctr.image.version* | `*"1.18" \| string` |- |
|
||||
|*ctr.image.version* | `*"1.19" \| string` |- |
|
||||
|
||||
### ecr.#Credentials Outputs
|
||||
|
||||
|
@ -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: {
|
||||
|
@ -28,7 +28,7 @@ TestPackageInstall: {
|
||||
image: #Image & {
|
||||
package: jq: true
|
||||
package: curl: true
|
||||
version: "3.13"
|
||||
version: "3.15.0"
|
||||
}
|
||||
|
||||
test: #up: [
|
||||
|
@ -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
|
||||
}
|
||||
},
|
||||
|
@ -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)
|
||||
|
||||
|
@ -64,7 +64,7 @@ import (
|
||||
test: #up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "~5.1"
|
||||
package: bash: true
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
|
@ -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",
|
||||
#"""
|
||||
|
@ -64,7 +64,7 @@ import (
|
||||
test: #up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "~5.1"
|
||||
package: bash: true
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -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
|
||||
|
@ -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"]
|
||||
|
@ -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
|
||||
}
|
||||
},
|
||||
|
@ -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)"
|
||||
|
@ -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"
|
||||
|
@ -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: """
|
||||
|
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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
|
||||
}
|
||||
},
|
||||
|
@ -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
|
||||
}
|
||||
},
|
||||
|
@ -12,7 +12,7 @@ import (
|
||||
#up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "=~5.1"
|
||||
package: bash: true
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -29,7 +29,7 @@ TestNetlify: {
|
||||
check: #up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "=~5.1"
|
||||
package: bash: true
|
||||
package: curl: true
|
||||
}
|
||||
},
|
||||
|
@ -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"
|
||||
}
|
||||
|
@ -25,7 +25,7 @@ import (
|
||||
|
||||
#up: [
|
||||
op.#Load & {from: alpine.#Image & {
|
||||
package: python3: "=~3.8"
|
||||
package: python3: true
|
||||
}},
|
||||
|
||||
op.#WriteFile & {
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
},
|
||||
|
2
tests/core/secrets/invalid/env/env.cue
vendored
2
tests/core/secrets/invalid/env/env.cue
vendored
@ -11,7 +11,7 @@ mySecret: dagger.#Secret
|
||||
TestSecrets: #up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "=~5.1"
|
||||
package: bash: true
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -10,7 +10,7 @@ mySecret: dagger.#Secret
|
||||
TestString: #up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "=~5.1"
|
||||
package: bash: true
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -11,7 +11,7 @@ mySecret: dagger.#Secret
|
||||
TestSecrets: #up: [
|
||||
op.#Load & {
|
||||
from: alpine.#Image & {
|
||||
package: bash: "=~5.1"
|
||||
package: bash: true
|
||||
}
|
||||
},
|
||||
|
||||
|
Reference in New Issue
Block a user