Merge pull request #1 from vector-im/rdanzey/ci-test

Update CI

Author: Arkaniad

.github/workflows/docker-image.yml

@@ -2,9 +2,9 @@ name: Docker Image CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, master ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, master ]
 
 jobs:
 
@@ -15,4 +15,4 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag docker-supervisord:$(date +%s)
+      run: docker build . --file Dockerfile --tag argocd:$(date +%s)

.github/workflows/docker-publish.yml

@@ -9,17 +9,17 @@ on:
   schedule:
     - cron: '16 1 * * *'
   push:
-    branches: [ main ]
+    branches: [ main, master ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, master ]
 
 env:
   # Use docker.io for Docker Hub if empty
   REGISTRY: ghcr.io
   # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
+  IMAGE_NAME: argocd
 
 
 jobs: