File tree 3 files changed +27
-14
lines changed
3 files changed +27
-14
lines changed Original file line number Diff line number Diff line change @@ -83,7 +83,7 @@ RUN { \
83
83
} > /usr/local/etc/php/conf.d/opcache-recommended.ini
84
84
85
85
{{ if env.version | startswith("7" ) then "" else ( -}}
86
- COPY --from=composer:{{ .composerVersion }} /usr/bin/composer /usr/local/bin/
86
+ COPY --from=composer:{{ .composer.version }} /usr/bin/composer /usr/local/bin/
87
87
88
88
{{ ) end -}}
89
89
# https://www.drupal.org/node/3060/release
Original file line number Diff line number Diff line change 12
12
"version" : " 7.78"
13
13
},
14
14
"8.9" : {
15
- "composerVersion" : " 1.10" ,
15
+ "composer" : {
16
+ "version" : " 1.10"
17
+ },
16
18
"md5" : " 75f7a83b14a1e4ec13ca9827f71ccd1c" ,
17
19
"phpVersions" : [
18
20
" 7.4"
25
27
"version" : " 8.9.13"
26
28
},
27
29
"9.0" : {
28
- "composerVersion" : " 1.10" ,
30
+ "composer" : {
31
+ "version" : " 1.10"
32
+ },
29
33
"phpVersions" : [
30
34
" 7.4"
31
35
],
37
41
"version" : " 9.0.11"
38
42
},
39
43
"9.1" : {
40
- "composerVersion" : " 2.0" ,
44
+ "composer" : {
45
+ "version" : " 2.0"
46
+ },
41
47
"phpVersions" : [
42
48
" 8.0" ,
43
49
" 7.4"
Original file line number Diff line number Diff line change 12
12
fi
13
13
versions=( " ${versions[@]%/ } " )
14
14
15
- declare -A composerVersions=(
16
- [8.9]=' 1.10' # https://github.com/drupal/drupal/blob/8.9.12/composer.lock#L4357-L4358
17
- [9.0]=' 1.10' # https://github.com/drupal/drupal/blob/9.0.10/composer.lock#L4448-L4449
18
- [9.1]=' 2.0' # https://github.com/drupal/drupal/blob/9.1.2/composer.lock#L4730-L4731
19
- )
20
-
21
15
for version in " ${versions[@]} " ; do
22
16
export version
23
17
@@ -66,14 +60,27 @@ for version in "${versions[@]}"; do
66
60
doc=" $( jq <<< " $doc" -c ' .md5 = env.md5' ) "
67
61
fi
68
62
69
- echo " $version : $fullVersion "
70
-
71
- composerVersion=" ${composerVersions[$version]:- } "
63
+ composerVersion=" $(
64
+ wget -qO- " https://github.com/drupal/drupal/raw/$fullVersion /composer.lock" \
65
+ | jq -r '
66
+ (.packages, ."packages-dev")[]
67
+ | select(.name == "composer/composer")
68
+ | .version
69
+ | split(".")[0:2] | join(".")
70
+ ' \
71
+ || :
72
+ ) "
73
+ if [ " $version " != ' 7' ] && [ -z " $composerVersion " ]; then
74
+ echo >&2 " error: cannot find composer version for '$version ' ('$fullVersion ')"
75
+ exit 1
76
+ fi
72
77
if [ -n " $composerVersion " ]; then
73
78
export composerVersion
74
- doc=" $( jq <<< " $doc" -c ' .composerVersion = env.composerVersion' ) "
79
+ doc=" $( jq <<< " $doc" -c ' .composer = { version: env.composerVersion } ' ) "
75
80
fi
76
81
82
+ echo " $version : $fullVersion ${composerVersion: + (composer $composerVersion )} "
83
+
77
84
export fullVersion
78
85
json=" $(
79
86
jq <<< " $json" -c --argjson doc " $doc " '
You can’t perform that action at this time.
0 commit comments