ci: fix dockerhub push

dyrector-io · Oct 14, 2023 · 898675f · 898675f
1 parent b9b0aa7
commit 898675f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 13 deletions.
diff --git a/.github/workflows/builder.yaml b/.github/workflows/builder.yaml
@@ -4,6 +4,7 @@ on:
     branches: [main]
 env:
   GITHUB_REGISTRY: ghcr.io
+  DOCKERHUB_REGISTRY: docker.io
   SERVICE_IMAGE_NAME: dyrector-io/darklens
   AGENT_IMAGE_NAME: dyrector-io/darklens/agent
   SETUP_WORKING_DIRECTORY: .
@@ -47,6 +48,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_PAT }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: docker.io
+          username: dyrectorio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Checkout
         uses: actions/checkout@v3
       - name: Adding workspace
@@ -56,8 +63,12 @@ jobs:
       - name: Push images to GHCR Registry
         run: |
           docker tag ${GITHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:latest ${GITHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
+          docker tag ${GITHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:latest ${DOCKERHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:latest
+          docker tag ${GITHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:${{ needs.setup.outputs.tag }} ${DOCKERHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
           docker image push ${GITHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:latest
           docker image push ${GITHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
+          docker image push ${DOCKERHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:latest
+          docker image push ${DOCKERHUB_REGISTRY}/${SERVICE_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
   agent-build:
     runs-on: ubuntu-22.04
     needs: setup
@@ -77,6 +88,12 @@ jobs:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_PAT }}
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          registry: docker.io
+          username: dyrectorio
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Setup Golang caches
         uses: actions/cache/restore@v3
         with:
@@ -103,8 +120,12 @@ jobs:
       - name: Push images to GHCR Registry
         run: |
           docker tag ${GITHUB_REGISTRY}/${AGENT_IMAGE_NAME}:latest ${GITHUB_REGISTRY}/${AGENT_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
+          docker tag ${GITHUB_REGISTRY}/${AGENT_IMAGE_NAME}:latest ${DOCKERHUB_REGISTRY}/${AGENT_IMAGE_NAME}:latest
+          docker tag ${GITHUB_REGISTRY}/${AGENT_IMAGE_NAME}:${{ needs.setup.outputs.tag }} ${DOCKERHUB_REGISTRY}/${AGENT_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
           docker image push ${GITHUB_REGISTRY}/${AGENT_IMAGE_NAME}:latest
           docker image push ${GITHUB_REGISTRY}/${AGENT_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
+          docker image push ${DOCKERHUB_REGISTRY}/${AGENT_IMAGE_NAME}:latest
+          docker image push ${DOCKERHUB_REGISTRY}/${AGENT_IMAGE_NAME}:${{ needs.setup.outputs.tag }}
       - name: Save Golang caches
         uses: actions/cache/save@v3
         with:

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@
 
 ## Getting started
 
-1. Enter `docker run -p 8000:8000 -p 5000:5000 --name darklens -d ghcr.io/dyrector-io/darklens:latest` in terminal
+1. Enter `docker run -p 8000:8000 -p 5000:5000 --name darklens -d dyrector-io/darklens:latest` in terminal
 2. Open `localhost:8000` in browser
 3. Enjoy!
 
@@ -28,35 +28,27 @@ Settings provides various configuration options for running darklens, tailor you
 
 Launch Darklens without any authentication or authorization checks. Ideal for quick testing and development.
 
-`docker run -p 8000:8000 -p 5000:5000 -e DISABLE_AUTH=true --name darklens -d ghcr.io/dyrector-io/darklens:latest`
+`docker run -p 8000:8000 -p 5000:5000 -e DISABLE_AUTH=true --name darklens -d dyrector-io/darklens:latest`
 
 #### Select a stronger JWT secret
 
 Enhance security by specifying a custom JWT secret for authentication.
 
-`docker run -p 8000:8000 -p 5000:5000 -e JWT_SECRET=supersecret --name darklens -d ghcr.io/dyrector-io/darklens:latest`
+`docker run -p 8000:8000 -p 5000:5000 -e JWT_SECRET=supersecret --name darklens -d dyrector-io/darklens:latest`
 
 #### Run on a public domain
 
 Configure darklens to run on a public domain with options for specifying a public URL and agent address.
 
-`docker run -p 8000:8000 -p 5000:5000 -e PUBLIC_URL=example.com AGENT_ADDRESS=example.com:5000 --name darklens -d ghcr.io/dyrector-io/darklens:latest`
+`docker run -p 8000:8000 -p 5000:5000 -e PUBLIC_URL=example.com AGENT_ADDRESS=example.com:5000 --name darklens -d dyrector-io/darklens:latest`
 
 > Note: Agents require gRPC port 5000 to connect to the service
 
 #### Persist data
 
 Ensure data persistence by using Docker volumes to store Darklens data.
 
-`docker run -p 8000:8000 -p 5000:5000 -v darklens-data:/var/lib/darklens --name darklens -d ghcr.io/dyrector-io/darklens:latest`
-
-#### Use secure agents
-
-Set up secure agents by running darklens over HTTPS, with HTTPS termination using Traefik or NGINX.
-
-`docker run -p 8000:8000 -p 5000:5000 --namedarklens -d ghcr.io/dyrector-io/darklens:latest`
-
-> Note: This requires HTTPS termination using Traefik or NGINX
+`docker run -p 8000:8000 -p 5000:5000 -v darklens-data:/var/lib/darklens --name darklens -d dyrector-io/darklens:latest`
 
 ## Agent install