From cea976fc4a5bd8b7641acb126b3ae185ac3cdab6 Mon Sep 17 00:00:00 2001 From: TrueOsiris Date: Thu, 23 Apr 2026 12:02:52 +0200 Subject: [PATCH 1/4] Fix typo in README.md: changed "Thx" to "Thanks to" --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f34e832..4447e7b 100755 --- a/README.md +++ b/README.md @@ -27,7 +27,8 @@ Docker image rebuild + tested on a linux dockerhost (unraid).
For now, u need to add this to the compose file:
`entrypoint: ["/bin/bash", "-c", "sed -i 's/\\r//g' /start.sh && exec /bin/bash /start.sh"]`
-Thx [laerdev](https://github.com/laerdev) for the fix.
+Thanks to [laerdev](https://github.com/laerdev) for the fix.
+ ### image 2025-08-01 From d22fd57b619833f1c06cefaf704245ce8ce16b6e Mon Sep 17 00:00:00 2001 From: TrueOsiris Date: Thu, 23 Apr 2026 12:03:25 +0200 Subject: [PATCH 2/4] Refactor Docker CI configuration to support CI/CD with Docker Hub integration --- .github/workflows/docker-image.yml | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index dd45635..bdff8fb 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,18 +1,26 @@ -name: Docker Image CI +name: Docker Image CI/CD on: push: branches: [ "main" ] - pull_request: - branches: [ "main" ] jobs: - - build: - + build-and-push: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag vrising:$(date +%s) + - name: Checkout Code + uses: actions/checkout@v4 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Build and Push + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + push: true + tags: trueosiris/vrising:latest, trueosiris/vrising:${{ github.sha }} \ No newline at end of file From 1181aef05acd3899ce5e86044d9d9a2b42853a25 Mon Sep 17 00:00:00 2001 From: TrueOsiris Date: Thu, 23 Apr 2026 12:13:59 +0200 Subject: [PATCH 3/4] Add workflow_dispatch trigger to Docker Image CI/CD --- .github/workflows/docker-image.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index bdff8fb..05bf5ed 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -3,6 +3,7 @@ name: Docker Image CI/CD on: push: branches: [ "main" ] + workflow_dispatch: jobs: build-and-push: From 7330cc1629caf60982cf5243016f6bdd6359ef9e Mon Sep 17 00:00:00 2001 From: TrueOsiris Date: Thu, 23 Apr 2026 12:21:48 +0200 Subject: [PATCH 4/4] Refactor Docker CI workflow: improve readability and update build-push action version --- .github/workflows/docker-image.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 05bf5ed..c2715b2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,13 +1,17 @@ +# .github/workflows/docker-image.yml +# Author: Tim Chaubet + name: Docker Image CI/CD on: push: branches: [ "main" ] - workflow_dispatch: + workflow_dispatch: # Allows you to run this manually from the Actions tab jobs: build-and-push: runs-on: ubuntu-latest + steps: - name: Checkout Code uses: actions/checkout@v4 @@ -15,13 +19,20 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: + # Make sure these match the Secret names in your GitHub Settings username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Build and Push - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile push: true - tags: trueosiris/vrising:latest, trueosiris/vrising:${{ github.sha }} \ No newline at end of file + # This updates 'latest' and adds a unique tag based on the commit hash + tags: | + trueosiris/vrising:latest + trueosiris/vrising:${{ github.sha }} \ No newline at end of file