Update the base image to ubuntu:18.04 (#40)

* Update the base image to ubuntu:18.04 * Update ci/pipeline.yaml * Make base-image resource name to a variable
zlabjp · Aug 27, 2018 · 3f15d3e · 3f15d3e
1 parent 4fc4eb5
commit 3f15d3e
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -38,3 +38,4 @@ script:
 - ./scripts/verify-authors.sh
 - make lint
 - make test
+- make image
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM golang:1.10
 RUN set -x && \
     go get -u -v github.com/kubernetes-sigs/aws-iam-authenticator/cmd/aws-iam-authenticator
 
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 
 MAINTAINER Kazuki Suda <ksuda@zlab.co.jp>
 

diff --git a/Makefile b/Makefile
@@ -1,3 +1,9 @@
+IMAGE := zlabjp/kubernetes-resource
+
+.PHONY: image
+image:
+		docker build -t $(IMAGE) .
+
 .PHONY: test
 test:
 		@scripts/run-bats.sh

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
@@ -4,7 +4,7 @@
 # DO NOT MAKE CHANGES TO THIS FILE. Instead, modify ci/pipeline.yml.erb and
 # execute build-pipeline-yml.
 #
-# created: 2018-08-21T15:18:07+09:00
+# created: 2018-08-27T15:50:45+09:00
 #
 resource_types:
 - name: slack-notification
@@ -19,11 +19,11 @@ resource_types:
     tag: latest
 
 resources:
-- name: ubuntu-16.04
+- name: ubuntu-18.04
   type: docker-image
   source:
     repository: ubuntu
-    tag: "16.04"
+    tag: "18.04"
 
 - name: kubernetes-resource
   type: git
@@ -162,7 +162,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: latest
@@ -173,7 +173,7 @@ jobs:
     - put: kubernetes-resource-image-edge
       params:
         build: kubernetes-resource
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -201,7 +201,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: stable-1.6
@@ -212,7 +212,7 @@ jobs:
     - put: kubernetes-resource-image-1.6
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -239,7 +239,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: stable-1.7
@@ -250,7 +250,7 @@ jobs:
     - put: kubernetes-resource-image-1.7
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -277,7 +277,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: stable-1.8
@@ -288,7 +288,7 @@ jobs:
     - put: kubernetes-resource-image-1.8
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -315,7 +315,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: stable-1.9
@@ -326,7 +326,7 @@ jobs:
     - put: kubernetes-resource-image-1.9
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -353,7 +353,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: stable-1.10
@@ -364,7 +364,7 @@ jobs:
     - put: kubernetes-resource-image-1.10
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -391,7 +391,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: stable-1.11
@@ -402,7 +402,7 @@ jobs:
     - put: kubernetes-resource-image-1.11
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -429,7 +429,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: ubuntu-18.04
         params: {save: true}
         trigger: true
       - get: latest
@@ -440,7 +440,7 @@ jobs:
     - put: kubernetes-resource-image-latest
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: ubuntu-18.04
         build_args_file: output/build-args-file
     on_success:
       put: notify

diff --git a/ci/pipeline.yml.erb b/ci/pipeline.yml.erb
@@ -1,8 +1,10 @@
 <%
+  kubernetes_versions = %w(stable-1.6 stable-1.7 stable-1.8 stable-1.9 stable-1.10 stable-1.11 latest)
   def tag(version); version.sub(/^stable-/, ''); end
   def image_resource_name(version); "kubernetes-resource-image-" + tag(version); end
 
-  kubernetes_versions = %w(stable-1.6 stable-1.7 stable-1.8 stable-1.9 stable-1.10 stable-1.11 latest)
+  base_image = {repository: 'ubuntu', tag: '18.04'}
+  def base_image.to_s; "#{self[:repository]}-#{self[:tag]}"; end
 %>
 # ci/pipeline.yml
 #
@@ -24,11 +26,11 @@ resource_types:
     tag: latest
 
 resources:
-- name: ubuntu-16.04
+- name: <%= base_image %>
   type: docker-image
   source:
-    repository: ubuntu
-    tag: "16.04"
+    repository: <%= base_image[:repository] %>
+    tag: "<%= base_image[:tag] %>"
 
 - name: kubernetes-resource
   type: git
@@ -83,7 +85,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource
         trigger: true
-      - get: ubuntu-16.04
+      - get: <%= base_image %>
         params: {save: true}
         trigger: true
       - get: latest
@@ -94,7 +96,7 @@ jobs:
     - put: <%= image_resource_name("edge") %>
       params:
         build: kubernetes-resource
-        load_base: ubuntu-16.04
+        load_base: <%= base_image %>
         build_args_file: output/build-args-file
     on_success:
       put: notify
@@ -122,7 +124,7 @@ jobs:
     - aggregate:
       - get: kubernetes-resource-release
         trigger: true
-      - get: ubuntu-16.04
+      - get: <%= base_image %>
         params: {save: true}
         trigger: true
       - get: <%= version %>
@@ -133,7 +135,7 @@ jobs:
     - put: <%= image_resource_name(version) %>
       params:
         build: kubernetes-resource-release
-        load_base: ubuntu-16.04
+        load_base: <%= base_image %>
         build_args_file: output/build-args-file
     on_success:
       put: notify