@@ -18,22 +18,8 @@ import (
18
18
19
19
var (
20
20
distros = map [string ]string {
21
- "ubuntu_precise" : "ubuntu:12.04" ,
22
- "ubuntu:12.04" : "ubuntu:12.04" ,
23
-
24
- "ubuntu_raring" : "ubuntu:13.04" ,
25
- "ubuntu:13.04" : "ubuntu:13.04" ,
26
-
27
- "ubuntu_trusty" : "ubuntu:14.04" ,
28
- "ubuntu:14.04" : "ubuntu:14.04" ,
29
-
30
- "ubuntu_xenial" : "ubuntu:16.04" ,
31
- "ubuntu:16.04" : "ubuntu:16.04" ,
32
-
33
- "ubuntu_bionic" : "ubuntu:18.04" ,
34
- "ubuntu:18.04" : "ubuntu:18.04" ,
35
-
36
- "centos:6.6" : "centos:6.6" ,
21
+ "ubuntu:18.04" : "ubuntu:18.04" ,
22
+ "ubuntu:18.04:libssl" : "ubuntu:18.04:libssl" , // drop this variant once we move beyond bionic
37
23
}
38
24
39
25
docker_client * docker.Client
@@ -358,12 +344,10 @@ func dockerFileFromTemplate(distro, ruby_version, arch, iteration string, patche
358
344
// This would be way better as a look up table, or with a more formal lookup process
359
345
var template_location string
360
346
switch distro {
361
- case "centos:6.6" :
362
- template_location = "data/Dockerfile-centos.template"
363
- case "ubuntu:16.04" :
364
- template_location = "data/Dockerfile-xenial.template"
365
347
case "ubuntu:18.04" :
366
348
template_location = "data/Dockerfile-bionic.template"
349
+ case "ubuntu:18.04:libssl" : // drop this variant once we move beyond bionic
350
+ template_location = "data/Dockerfile-bionic-libssl.template"
367
351
default :
368
352
template_location = "data/Dockerfile.template"
369
353
}
@@ -393,12 +377,10 @@ func dockerFileFromTemplate(distro, ruby_version, arch, iteration string, patche
393
377
394
378
func gemfilesFromDistro (distro string ) (string , string ) {
395
379
switch distro {
396
- case "centos:6.6" :
397
- return "data/Gemfile.centos" , "data/Gemfile.centos.lock"
398
- case "ubuntu:16.04" :
399
- return "data/Gemfile.xenial" , "data/Gemfile.xenial.lock"
400
380
case "ubuntu:18.04" :
401
381
return "data/Gemfile.bionic" , "data/Gemfile.bionic.lock"
382
+ case "ubuntu:18.04:libssl" : // drop this variant once we move beyond bionic
383
+ return "data/Gemfile.bionic" , "data/Gemfile.bionic.lock"
402
384
default :
403
385
return "data/Gemfile.template" , "data/Gemfile.template.lock"
404
386
}
0 commit comments