From 877852aa67541b559099a199f1a5eb0900b6a57c Mon Sep 17 00:00:00 2001
From: Noah Theus <noah@theus.me>
Date: Sun, 22 Dec 2024 04:06:08 +0100
Subject: [PATCH] Change from ghcr to dockerhub

---
 .github/workflows/docker-on-push.yml | 14 ++++----------
 docker-compose.yaml                  |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/docker-on-push.yml b/.github/workflows/docker-on-push.yml
index 8e5a593..928f14b 100644
--- a/.github/workflows/docker-on-push.yml
+++ b/.github/workflows/docker-on-push.yml
@@ -2,8 +2,6 @@ name: Build and Push to Docker Hub on changes to master branch
 
 on:
   push:
-    branches:
-      - master
 
 jobs:
   docker:
@@ -18,10 +16,8 @@ jobs:
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{github.actor}}
-          password: ${{secrets.GHCR_TOKEN}} # needs read:packages, write:packages. delete:packages
-
+          username: ${{secrets.DOCKERHUB_USERNAME}}
+          password: ${{secrets.DOCKERHUB_TOKEN}}
 
       - name: Build and push
         uses: docker/build-push-action@v6
@@ -29,7 +25,5 @@ jobs:
           platforms: linux/amd64,linux/386,linux/arm64,linux/arm/v7
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:master
-            ghcr.io/${{ github.repository }}:commit-${{ github.sha }}        
-
-
+            ${{ github.repository }}:${{ github.ref_name }}
+            ${{ github.repository }}:commit-${{ github.sha }}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index e3906bc..a782b61 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,6 +1,6 @@
 services:
   steamsalty:
-    image: ghcr.io/watn3y/steamsalty:master
+    image: watn3y/steamsalty:master
     container_name: steamsalty
     restart: unless-stopped
     volumes: