From f83b3ce29acb37c4a01ca4d75fa8f663bb23a48f Mon Sep 17 00:00:00 2001
From: Costa Huang <costa.huang@outlook.com>
Date: Sat, 15 Dec 2018 22:56:16 -0500
Subject: [PATCH] Master # Use the latest images

---
 .drone.yml                        | 49 +++++++++++++++----------------
 docker-compose.yaml               |  8 ++---
 k8s/docker-compose.build.dev.yaml |  2 +-
 k8s/docker-compose.build.yaml     |  6 ++--
 4 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 177a29e..a390ad2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,29 +1,28 @@
-# New syntax
+---
 kind: pipeline
 name: production
 steps:
-- name: docker  
-  image: docker:18.06.1-ce-dind
-  privileged: true
-  environment:
-    Salt:
-      from_secret: Salt
-    DOCKER_HOST:
-      unix:///var/run/host.sock
-    docker_username:
-      from_secret: docker_username
-    docker_password:
-      from_secret: docker_password
-  commands:
-    - docker login -u $docker_username -p $docker_password
-    - apk add git
-    - git fetch --tags
-    - git describe --always
-    - sh ./docker-build.sh
-  volumes:
-  - name: cache
-    path: /var/run/host.sock
+  - name: build-docker-images
+    image: docker:18.06.1-ce-dind
+    privileged: true
+    environment:
+      Salt:
+        from_secret: Salt
+      DOCKER_HOST:
+        unix:///var/run/host.sock
+      docker_username:
+        from_secret: docker_username
+      docker_password:
+        from_secret: docker_password
+    commands:
+      - docker login -u $docker_username -p $docker_password
+      - apk add git
+      - git fetch --tags\
+      - sh ./docker-build.sh
+    volumes:
+    - name: docker-sock
+      path: /var/run/host.sock
 volumes:
-- name: cache
-  host:
-    path: /var/run/docker.sock
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index ca3e4f2..cf8ccd1 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
 
   salt_generator:
-    image: vwxyzjn/portwarden-server-dev:1.7.0
+    image: vwxyzjn/portwarden-server-dev:v0.1.1
     environment:
       - Salt=${Salt}
     volumes:
@@ -12,7 +12,7 @@ services:
       go run ./utils/generate_salt_file.go
 
   scheduler:
-    image: vwxyzjn/portwarden-server-dev:1.7.0
+    image: vwxyzjn/portwarden-server-dev:v0.1.1
     stdin_open: true
     tty: true
     environment:
@@ -33,7 +33,7 @@ services:
       - 6379:6379
 
   worker:
-    image: vwxyzjn/portwarden-server-dev:1.7.0
+    image: vwxyzjn/portwarden-server-dev:v0.1.1
     stdin_open: true
     tty: true
     environment:
@@ -58,7 +58,7 @@ services:
     - "8081:8081"
 
   frontend:
-    image: vwxyzjn/portwarden-frontend:1.2.0
+    image: vwxyzjn/portwarden-frontend:v0.1.1
     restart: always
     ports:
     - "8000:8000"
diff --git a/k8s/docker-compose.build.dev.yaml b/k8s/docker-compose.build.dev.yaml
index 7c36823..89bc1b0 100644
--- a/k8s/docker-compose.build.dev.yaml
+++ b/k8s/docker-compose.build.dev.yaml
@@ -53,7 +53,7 @@ services:
       kompose.service.type: "loadbalancer"
 
   frontend:
-    image: vwxyzjn/portwarden-frontend:1.2.0
+    image: vwxyzjn/portwarden-frontend:v0.1.1
     restart: always
     ports:
     - "8000:8000"
diff --git a/k8s/docker-compose.build.yaml b/k8s/docker-compose.build.yaml
index a482aca..731fd3a 100644
--- a/k8s/docker-compose.build.yaml
+++ b/k8s/docker-compose.build.yaml
@@ -3,7 +3,7 @@ version: '3'
 services:
 
   scheduler:
-    image: vwxyzjn/portwarden-server-prod:1.7.3
+    image: vwxyzjn/portwarden-server-prod:v0.1.1
     stdin_open: true
     tty: true
     environment:
@@ -25,7 +25,7 @@ services:
     image: redis
 
   worker:
-    image: vwxyzjn/portwarden-server-prod:1.7.3
+    image: vwxyzjn/portwarden-server-prod:v0.1.1
     stdin_open: true
     tty: true
     environment:
@@ -53,7 +53,7 @@ services:
       kompose.service.type: "loadbalancer"
 
   frontend:
-    image: vwxyzjn/portwarden-frontend:1.2.0
+    image: vwxyzjn/portwarden-frontend:v0.1.1
     restart: always
     ports:
     - "8000:8000"