|
57 | 57 | # with no arguments
|
58 | 58 | image_config = {
|
59 | 59 | "cli": {
|
| 60 | + "tag": "latest", |
60 | 61 | "directory": "cli",
|
61 | 62 | "binaries": {
|
62 | 63 | "oc": "/usr/bin/oc",
|
63 | 64 | },
|
64 | 65 | "files": {}
|
65 | 66 | },
|
66 | 67 | "control-plane": {
|
| 68 | + "tag": "latest", |
67 | 69 | "directory": "origin",
|
68 | 70 | "binaries": {
|
69 | 71 | "openshift": "/usr/bin/openshift",
|
|
72 | 74 | "files": {}
|
73 | 75 | },
|
74 | 76 | "hyperkube": {
|
| 77 | + "tag": "latest", |
75 | 78 | "directory": "hyperkube",
|
76 | 79 | "binaries": {
|
77 | 80 | "hyperkube": "/usr/bin/hyperkube",
|
78 | 81 | },
|
79 | 82 | "files": {}
|
80 | 83 | },
|
81 | 84 | "hypershift": {
|
| 85 | + "tag": "latest", |
82 | 86 | "directory": "hypershift",
|
83 | 87 | "binaries": {
|
84 | 88 | "hypershift": "/usr/bin/hypershift",
|
85 | 89 | },
|
86 | 90 | "files": {}
|
87 | 91 | },
|
88 | 92 | "deployer": {
|
| 93 | + "tag": "latest", |
89 | 94 | "directory": "deployer",
|
90 | 95 | "binaries": {
|
91 | 96 | "openshift": "/usr/bin/openshift"
|
92 | 97 | },
|
93 | 98 | "files": {}
|
94 | 99 | },
|
95 | 100 | "recycler": {
|
| 101 | + "tag": "latest", |
96 | 102 | "directory": "recycler",
|
97 | 103 | "binaries": {
|
98 | 104 | "openshift": "/usr/bin/openshift"
|
99 | 105 | },
|
100 | 106 | "files": {}
|
101 | 107 | },
|
102 | 108 | "docker-builder": {
|
| 109 | + "tag": "latest", |
103 | 110 | "directory": "builder/docker/docker-builder",
|
104 | 111 | "binaries": {
|
105 | 112 | "openshift": "/usr/bin/openshift"
|
106 | 113 | },
|
107 | 114 | "files": {}
|
108 | 115 | },
|
109 | 116 | "f5-router": {
|
| 117 | + "tag": "latest", |
110 | 118 | "directory": "router/f5",
|
111 | 119 | "binaries": {
|
112 | 120 | "openshift": "/usr/bin/openshift"
|
113 | 121 | },
|
114 | 122 | "files": {}
|
115 | 123 | },
|
116 | 124 | "nginx-router": {
|
| 125 | + "tag": "latest", |
117 | 126 | "directory": "router/nginx",
|
118 | 127 | "binaries": {
|
119 | 128 | "openshift": "/usr/bin/openshift"
|
|
123 | 132 | }
|
124 | 133 | },
|
125 | 134 | "haproxy-router": {
|
| 135 | + "tag": "latest", |
126 | 136 | "directory": "router/haproxy",
|
127 | 137 | "binaries": {
|
128 | 138 | "openshift": "/usr/bin/openshift"
|
|
132 | 142 | }
|
133 | 143 | },
|
134 | 144 | "keepalived-ipfailover": {
|
| 145 | + "tag": "latest", |
135 | 146 | "directory": "ipfailover/keepalived",
|
136 | 147 | "binaries": {
|
137 | 148 | "openshift": "/usr/bin/openshift"
|
|
141 | 152 | }
|
142 | 153 | },
|
143 | 154 | "node": {
|
| 155 | + "tag": "latest", |
144 | 156 | "directory": "node",
|
145 | 157 | "binaries": {
|
146 | 158 | "openshift": "/usr/bin/openshift",
|
|
150 | 162 | "files": {}
|
151 | 163 | },
|
152 | 164 | "template-service-broker": {
|
| 165 | + "tag": "latest", |
153 | 166 | "directory": "template-service-broker",
|
154 | 167 | "binaries": {
|
155 | 168 | "template-service-broker": "/usr/bin/template-service-broker"
|
@@ -224,7 +237,8 @@ def debug(message):
|
224 | 237 | build_occurred = True
|
225 | 238 | print "[INFO] Building {}...".format(image)
|
226 | 239 | with open(join(context_dir, "Dockerfile"), "w+") as dockerfile:
|
227 |
| - dockerfile.write("FROM {}\n".format(full_name(image))) |
| 240 | + dockerfile.write("FROM {}:{}\n".format(full_name(image), image_config[image]["tag"])) |
| 241 | + |
228 | 242 |
|
229 | 243 | binary_dir_args = ["_output", "local", "bin", "linux", "amd64"]
|
230 | 244 | config = image_config[image]
|
|
0 commit comments