From c94951579878cf4fd881cbecc6d58629a7357507 Mon Sep 17 00:00:00 2001
From: aakatev <aakatev@mail.sfsu.edu>
Date: Tue, 8 Dec 2020 20:13:18 -0800
Subject: [PATCH] Add different versions of Envoy

---
 .../{build.yml => build-v1.14-latest.yml}     | 16 +++++------
 .github/workflows/build-v1.15-latest.yml      | 28 +++++++++++++++++++
 .github/workflows/build-v1.16-latest.yml      | 28 +++++++++++++++++++
 3 files changed, 64 insertions(+), 8 deletions(-)
 rename .github/workflows/{build.yml => build-v1.14-latest.yml} (56%)
 create mode 100644 .github/workflows/build-v1.15-latest.yml
 create mode 100644 .github/workflows/build-v1.16-latest.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build-v1.14-latest.yml
similarity index 56%
rename from .github/workflows/build.yml
rename to .github/workflows/build-v1.14-latest.yml
index f99a920..37f5c64 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build-v1.14-latest.yml
@@ -1,4 +1,4 @@
-name: Build Enovy and push on DockerHub 
+name: Build Enovy v1.14 and push on DockerHub 
 on:
   push:
     branches: [ master ]
@@ -6,7 +6,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout source code
+      uses: actions/checkout@v2
 
     - name: Login to DockerHub
       uses: docker/login-action@v1 
@@ -18,11 +19,10 @@ jobs:
       uses: docker/build-push-action@v2
       with:
         context: .
-        tags: aakatev/envoy-fips:v1.16-latest
+        tags: aakatev/envoy:v1.14-latest
         load: true
+        build-args: |
+          ENVOY_BRANCH=release/v1.14
 
-    - name: Push Envoy image
-      run: docker push aakatev/envoy-fips:v1.16-latest
-
-    - name: Image digest
-      run: echo ${{ steps.docker_build.outputs.digest }}
+    - name: Push Envoy image to DockerHub
+      run: docker push aakatev/envoy:v1.14-latest
diff --git a/.github/workflows/build-v1.15-latest.yml b/.github/workflows/build-v1.15-latest.yml
new file mode 100644
index 0000000..e11ac90
--- /dev/null
+++ b/.github/workflows/build-v1.15-latest.yml
@@ -0,0 +1,28 @@
+name: Build Enovy v1.15 and push on DockerHub 
+on:
+  push:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout source code
+      uses: actions/checkout@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1 
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+    - name: Build Envoy image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        tags: aakatev/envoy:v1.15-latest
+        load: true
+        build-args: |
+          ENVOY_BRANCH=release/v1.15
+
+    - name: Push Envoy image to DockerHub
+      run: docker push aakatev/envoy:v1.15-latest
diff --git a/.github/workflows/build-v1.16-latest.yml b/.github/workflows/build-v1.16-latest.yml
new file mode 100644
index 0000000..af243dc
--- /dev/null
+++ b/.github/workflows/build-v1.16-latest.yml
@@ -0,0 +1,28 @@
+name: Build Enovy v1.16 and push on DockerHub 
+on:
+  push:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout source code
+      uses: actions/checkout@v2
+
+    - name: Login to DockerHub
+      uses: docker/login-action@v1 
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+    - name: Build Envoy image
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        tags: aakatev/envoy:v1.16-latest
+        load: true
+        build-args: |
+          ENVOY_BRANCH=release/v1.16
+
+    - name: Push Envoy image to DockerHub
+      run: docker push aakatev/envoy:v1.16-latest