Update for Kaniko -> 20.04-41

davidjsanders · Apr 28, 2020 · 1ac45db · 1ac45db
1 parent 1978377
commit 1ac45db
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 22 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 ifndef BUILD_NUMBER
-  override BUILD_NUMBER := 20.04-39
+  override BUILD_NUMBER := 20.04-41
 endif
 
 ifndef COWBULL_PORT

diff --git a/cloudbuild-google.yaml b/cloudbuild-google.yaml
@@ -9,17 +9,6 @@ steps:
   - --cache=true
   - --cache-ttl=24h
   - --destination=gcr.io/$PROJECT_ID/cowbull:${_BUILD_NUMBER}
-  - --dockerfile vendor/docker/Dockerfile
-# - name: 'gcr.io/cloud-builders/docker'
-#   args: [ 
-#     'build', 
-#     '-t', 
-#     'gcr.io/$PROJECT_ID/cowbull:${_BUILD_NUMBER}', 
-#     '-f',
-#     'vendor/docker/Dockerfile',
-#     '.' 
-#   ]
+  - --dockerfile=vendor/docker/Dockerfile
 substitutions:
-  _BUILD_NUMBER: "20.04-39"
-images:
-- 'gcr.io/$PROJECT_ID/cowbull:${_BUILD_NUMBER}'
+  _BUILD_NUMBER: "20.04-41"
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -14,7 +14,7 @@ steps:
     '.' 
   ]
 substitutions:
-  _BUILD_NUMBER: "20.04-39"
+  _BUILD_NUMBER: "20.04-41"
 images:
 - 'gcr.io/personal-dev-272223/cowbull:${_BUILD_NUMBER}'
 artifacts:

diff --git a/vendor/k8s/app-google.yaml b/vendor/k8s/app-google.yaml
@@ -97,8 +97,8 @@ spec:
           value: "8080"
         - name: WORKERS
           value: "1"
-        image: gcr.io/djsanders-dev-spaces/cowbull:20.04-39
-        # image: dsanderscan/cowbull:20.04-39
+        image: gcr.io/djsanders-dev-spaces/cowbull:20.04-41
+        # image: dsanderscan/cowbull:20.04-41
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -185,7 +185,7 @@ spec:
         - name: NAVBAR_COLOUR
           value: "bg-primary"
         image: gcr.io/djsanders-dev-spaces/cowbull_webapp:20.04-23
-        # image: dsanderscan/cowbull_webapp:20.04-39
+        # image: dsanderscan/cowbull_webapp:20.04-41
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:

diff --git a/vendor/k8s/app.yaml b/vendor/k8s/app.yaml
@@ -97,8 +97,8 @@ spec:
           value: "8080"
         - name: WORKERS
           value: "1"
-        image: gcr.io/djsanders-dev-spaces/cowbull:20.04-39
-        # image: dsanderscan/cowbull:20.04-39
+        image: gcr.io/djsanders-dev-spaces/cowbull:20.04-41
+        # image: dsanderscan/cowbull:20.04-41
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:
@@ -184,7 +184,7 @@ spec:
         #   value: "bg-success"
         - name: NAVBAR_COLOUR
           value: "bg-primary"
-        image: dsanderscan/cowbull_webapp:20.04-39
+        image: dsanderscan/cowbull_webapp:20.04-41
         imagePullPolicy: IfNotPresent
         livenessProbe:
           exec:

diff --git a/vendor/k8s/cowbull-deploy.yaml b/vendor/k8s/cowbull-deploy.yaml
@@ -30,7 +30,7 @@ spec:
           value: "8080"
         - name: WORKERS
           value: "1"
-        image: dsanderscan/cowbull:20.04-39
+        image: dsanderscan/cowbull:20.04-41
         imagePullPolicy: IfNotPresent
         name: cowbull-server
         ports: