@@ -43,7 +43,6 @@ for (const version of versions) {
4343 let defaultAlpine = config [ version ] [ 'alpine-default' ]
4444 let defaultDebian = config [ version ] [ 'debian-default' ]
4545 let variants = config [ version ] . variants
46- let fullversion ;
4746 for ( const variant in variants ) {
4847 let dockerfilePath = path . join ( version , variant , 'Dockerfile' ) ;
4948 let isAlpine = alpineRE . test ( variant )
@@ -52,44 +51,44 @@ for (const version of versions) {
5251
5352 // Get full version from the Dockerfile
5453 let dockerfile = fs . readFileSync ( dockerfilePath , 'utf-8' )
55- fullversion = dockerfile . match ( / E N V N O D E _ V E R S I O N = (?< major > \d + ) \. (?< minor > \d + ) \. (?< patch > \d + ) / )
54+ let fullVersion = dockerfile . match ( / E N V N O D E _ V E R S I O N = (?< major > \d + ) \. (?< minor > \d + ) \. (?< patch > \d + ) / )
5655
5756 let tags = [
58- `${ fullversion . groups . major } .${ fullversion . groups . minor } .${ fullversion . groups . patch } -${ variant } ` ,
59- `${ fullversion . groups . major } .${ fullversion . groups . minor } -${ variant } ` ,
60- `${ fullversion . groups . major } -${ variant } ` ,
57+ `${ fullVersion . groups . major } .${ fullVersion . groups . minor } .${ fullVersion . groups . patch } -${ variant } ` ,
58+ `${ fullVersion . groups . major } .${ fullVersion . groups . minor } -${ variant } ` ,
59+ `${ fullVersion . groups . major } -${ variant } ` ,
6160 ]
6261
6362 if ( codename ) {
6463 tags . push ( `${ codename } -${ variant } ` )
6564 }
6665
6766 if ( variant === defaultAlpine ) {
68- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } .${ fullversion . groups . patch } -alpine` )
69- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } -alpine` )
70- tags . push ( `${ fullversion . groups . major } -alpine` )
67+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } .${ fullVersion . groups . patch } -alpine` )
68+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } -alpine` )
69+ tags . push ( `${ fullVersion . groups . major } -alpine` )
7170 if ( codename ) {
7271 tags . push ( `${ codename } -alpine` )
7372 }
7473 }
7574
7675 if ( variant === defaultDebian ) {
77- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } .${ fullversion . groups . patch } ` )
78- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } ` )
79- tags . push ( `${ fullversion . groups . major } ` )
76+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } .${ fullVersion . groups . patch } ` )
77+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } ` )
78+ tags . push ( `${ fullVersion . groups . major } ` )
8079 if ( isSlim ) {
81- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } .${ fullversion . groups . patch } -slim` )
82- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } -slim` )
83- tags . push ( `${ fullversion . groups . major } -slim` )
80+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } .${ fullVersion . groups . patch } -slim` )
81+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } -slim` )
82+ tags . push ( `${ fullVersion . groups . major } -slim` )
8483 }
8584 if ( codename ) {
8685 tags . push ( `${ codename } ` )
8786 }
8887 }
8988 if ( isDefaultSlim ) {
90- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } .${ fullversion . groups . patch } -slim` )
91- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } -slim` )
92- tags . push ( `${ fullversion . groups . major } -slim` )
89+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } .${ fullVersion . groups . patch } -slim` )
90+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } -slim` )
91+ tags . push ( `${ fullVersion . groups . major } -slim` )
9392 if ( codename ) {
9493 tags . push ( `${ codename } -slim` )
9594 }
@@ -98,9 +97,9 @@ for (const version of versions) {
9897 if ( isCurrent ) {
9998 if ( variant === defaultAlpine ) {
10099 tags . push ( variant )
101- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } .${ fullversion . groups . patch } -alpine` )
102- tags . push ( `${ fullversion . groups . major } .${ fullversion . groups . minor } -alpine` )
103- tags . push ( `${ fullversion . groups . major } -alpine` )
100+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } .${ fullVersion . groups . patch } -alpine` )
101+ tags . push ( `${ fullVersion . groups . major } .${ fullVersion . groups . minor } -alpine` )
102+ tags . push ( `${ fullVersion . groups . major } -alpine` )
104103 tags . push ( 'alpine' )
105104 tags . push ( 'current-alpine' )
106105 }
0 commit comments