From 2e12eb193b2562987d302a47e2431079f5fc8d5e Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Thu, 21 May 2020 11:44:29 -0500
Subject: [PATCH] cleanup docker CI

---
 .github/workflows/docker.yml    | 23 -----------------------
 .github/workflows/dockerhub.yml | 27 ++++++++++++++++++---------
 2 files changed, 18 insertions(+), 32 deletions(-)
 delete mode 100644 .github/workflows/docker.yml

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
deleted file mode 100644
index bc63bdc68..000000000
--- a/.github/workflows/docker.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Docker Release
-
-on:
-  push:
-    tags:
-      - 'nosqlbench-*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-      - name: Build nosqlbench docker
-        run: cd nb && docker build -t nosqlbench -f ./Dockerfile-build ./
-      - name: Publish to Registry
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: nosqlbench/nosqlbench
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tag_names: true
-          dockerfile: Dockerfile
-          workdir: nb
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
index 281ca0576..9105ef7b2 100644
--- a/.github/workflows/dockerhub.yml
+++ b/.github/workflows/dockerhub.yml
@@ -1,23 +1,15 @@
-# This is a basic workflow to help you get started with Actions
-
 name: dockerhub
 
 on:
   push:
-    # Sequence of patterns matched against refs/tags
     tags:
-    - 'nosqlbench-*' # Push events to matching nosqlbench-[version]
+    - nosqlbench-**
 
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  # This workflow contains a single job called "build"
   build:
-    # The type of runner that the job will run on
     runs-on: ubuntu-latest
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
     - uses: actions/checkout@v2
     - name: Login to DockerHub Registry
       run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
@@ -32,3 +24,20 @@ jobs:
       run: docker build ./nb/ --file Dockerfile --tag nosqlbench/nosqlbench:latest
     - name: Push the latest Docker image
       run: docker push nosqlbench/nosqlbench:latest
+
+#jobs: (copied from docker.yml, this snippet references non-extant Dockerfile-build
+#  build:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@master
+#      - name: Build nosqlbench docker
+#        run: cd nb && docker build -t nosqlbench -f ./Dockerfile-build ./
+#      - name: Publish to Registry
+#        uses: elgohr/Publish-Docker-Github-Action@master
+#        with:
+#          name: nosqlbench/nosqlbench
+#          username: ${{ secrets.DOCKER_USERNAME }}
+#          password: ${{ secrets.DOCKER_PASSWORD }}
+#          tag_names: true
+#          dockerfile: Dockerfile
+#          workdir: nb