Merge 2332e96f89 into 730d6f294a

rename build id's in action
Label images correctly in yaml
2025-01-13 16:30:38 -06:00 · 2024-11-18 17:06:57 +01:00 · 2024-11-18 15:00:53 +00:00 · 2024-11-18 14:59:41 +00:00 · 2024-11-18 13:24:20 +00:00 · 2024-11-18 07:19:56 +00:00
2 changed files with 54 additions and 3 deletions
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@ -0,0 +1,52 @@
+name: Push Docker Image to Docker Hub
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  push_to_docker_hub:
+    name: Push Docker Image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        id: checkout_code
+        uses: actions/checkout@v3
+
+      - name: Login to Docker Hub
+        id: login_docker_hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USER_NAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      
+      - name: Echo Docker Hub Username
+        run: echo ${{ secrets.DOCKER_HUB_USER_NAME }}
+
+      - name: Echo GitHub SHA
+        run: echo $GITHUB_SHA
+
+      - name: Build Docker image
+        id: build_image
+        run: |
+          docker build "$GITHUB_WORKSPACE" -t sickcodes/docker-osx:master --label dockerfile-path="Dockerfile"
+
+      - name: Label Master Docker Image as Latest
+        id: label_image
+        run: |
+          docker tag sickcodes/docker-osx:master sickcodes/docker-osx:latest
+
+      - name: Push Docker image master
+        id: push_master
+        run: docker push sickcodes/docker-osx:master
+
+      - name: Push Docker image latest
+        id: push_latest
+        run: docker push sickcodes/docker-osx:latest
+
+      - name: Logout from Docker Hub
+        run: docker logout
+
+      - name: End
+        run: echo "Docker image pushed to Docker Hub successfully"
--- a/5
+++ b/5
@ -7,7 +7,7 @@
 #
 # Title:            Docker-OSX (Mac on Docker)
 # Author:           Sick.Codes https://twitter.com/sickcodes
-# Version:          6.0
+# Version:          7.0
 # License:          GPLv3+
 # Repository:       https://github.com/sickcodes/Docker-OSX
 # Website:          https://sick.codes
@ -195,8 +195,7 @@ RUN touch Launch.sh \
    && tee -a Launch.sh <<< '-cpu ${CPU:-Penryn},${CPUID_FLAGS:-vendor=GenuineIntel,+invtsc,vmware-cpuid-freq=on,+ssse3,+sse4.2,+popcnt,+avx,+aes,+xsave,+xsaveopt,check,}${BOOT_ARGS} \' \
    && tee -a Launch.sh <<< '-machine q35,${KVM-"accel=kvm:tcg"} \' \
    && tee -a Launch.sh <<< '-smp ${CPU_STRING:-${SMP:-4},cores=${CORES:-4}} \' \
-    && tee -a Launch.sh <<< '-device qemu-xhci,id=xhci \' \
-    && tee -a Launch.sh <<< '-device usb-kbd,bus=xhci.0 -device usb-tablet,bus=xhci.0 \' \
+    && tee -a Launch.sh <<< '${XHCI_STRING:--usb -device usb-kbd -device usb-tablet} \' \
    && tee -a Launch.sh <<< '-device isa-applesmc,osk=ourhardworkbythesewordsguardedpleasedontsteal\(c\)AppleComputerInc \' \
    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,readonly=on,file=/home/arch/OSX-KVM/OVMF_CODE.fd \' \
    && tee -a Launch.sh <<< '-drive if=pflash,format=raw,file=/home/arch/OSX-KVM/OVMF_VARS-1024x768.fd \' \
Author	SHA1	Message	Date
sickcodes	e8b7672351	Merge `2332e96f89` into `730d6f294a`	2024-11-18 17:06:57 +01:00
sickcodes	730d6f294a	rename build id's in action Some checks failed Push Docker Image to Docker Hub / Push Docker Image to Docker Hub (push) Has been cancelled Details	2024-11-18 15:00:53 +00:00
sickcodes	93c2119ebc	Label images correctly in yaml	2024-11-18 14:59:41 +00:00
sickcodes	fb8aa4b248	Push latest Some checks are pending Push Docker Image to Docker Hub / Push Docker Image to Docker Hub (push) Waiting to run Details	2024-11-18 13:24:20 +00:00
sickcodes	b5a70782cc	Push latest	2024-11-18 07:19:56 +00:00
sickcodes	61b21421f6	main to master, -ng typo	2024-11-18 07:07:00 +00:00
sickcodes	342c09eb2a	Add docker-build.yml	2024-11-18 07:05:24 +00:00
sickcodes	2332e96f89	Revert XHCI/device line to the old usb-kbd/tablet string. And make new images use runtime option `-e XHCI_STRING="-device qemu-xhci,id=xhci -device usb-kbd,bus=xhci.0 -device usb-tablet,bus=xhci.0"`	2024-09-03 12:36:42 +00:00
sickcodes	d2c4811b6a	XHCI one line before fixing	2024-09-03 12:26:45 +00:00