mirror of
https://github.com/vdsm/virtual-dsm.git
synced 2025-11-07 02:23:42 +08:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
037d52957a | ||
|
|
c7ccc912b5 | ||
|
|
72cbf87986 | ||
|
|
317024d327 | ||
|
|
121c487383 | ||
|
|
fd92b60218 | ||
|
|
771429c5d3 | ||
|
|
674b6e5bda | ||
|
|
7c65e2740f | ||
|
|
d462c6d7a2 | ||
|
|
d5637e8da0 | ||
|
|
1b75bd3c44 | ||
|
|
2551413040 |
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -44,6 +44,8 @@ jobs:
|
|||||||
TAGS=()
|
TAGS=()
|
||||||
TAGS=("${{ github.repository }}:latest")
|
TAGS=("${{ github.repository }}:latest")
|
||||||
TAGS+=("${{ github.repository }}:${VERSION}")
|
TAGS+=("${{ github.repository }}:${VERSION}")
|
||||||
|
TAGS+=("${{ secrets.DOCKERHUB_MIRROR }}:latest")
|
||||||
|
TAGS+=("${{ secrets.DOCKERHUB_MIRROR }}:${VERSION}")
|
||||||
TAGS+=("ghcr.io/${{ github.repository }}:latest")
|
TAGS+=("ghcr.io/${{ github.repository }}:latest")
|
||||||
TAGS+=("ghcr.io/${{ github.repository }}:${VERSION}")
|
TAGS+=("ghcr.io/${{ github.repository }}:${VERSION}")
|
||||||
|
|
||||||
|
|||||||
9
.github/workflows/hub.yml
vendored
9
.github/workflows/hub.yml
vendored
@@ -22,3 +22,12 @@ jobs:
|
|||||||
repository: ${{ github.repository }}
|
repository: ${{ github.repository }}
|
||||||
short-description: ${{ github.event.repository.description }}
|
short-description: ${{ github.event.repository.description }}
|
||||||
readme-filepath: ./readme.md
|
readme-filepath: ./readme.md
|
||||||
|
-
|
||||||
|
name: Docker Hub Description
|
||||||
|
uses: peter-evans/dockerhub-description@v3
|
||||||
|
with:
|
||||||
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
repository: ${{ secrets.DOCKERHUB_MIRROR }}
|
||||||
|
short-description: ${{ github.event.repository.description }}
|
||||||
|
readme-filepath: ./readme.md
|
||||||
|
|||||||
@@ -62,8 +62,8 @@ LABEL org.opencontainers.image.title="Virtual DSM"
|
|||||||
LABEL org.opencontainers.image.created=${DATE_ARG}
|
LABEL org.opencontainers.image.created=${DATE_ARG}
|
||||||
LABEL org.opencontainers.image.revision=${BUILD_ARG}
|
LABEL org.opencontainers.image.revision=${BUILD_ARG}
|
||||||
LABEL org.opencontainers.image.version=${VERSION_ARG}
|
LABEL org.opencontainers.image.version=${VERSION_ARG}
|
||||||
LABEL org.opencontainers.image.source="https://github.com/kroese/virtual-dsm/"
|
LABEL org.opencontainers.image.source="https://github.com/vdsm/virtual-dsm/"
|
||||||
LABEL org.opencontainers.image.url="https://hub.docker.com/r/kroese/virtual-dsm/"
|
LABEL org.opencontainers.image.url="https://hub.docker.com/r/vdsm/virtual-dsm/"
|
||||||
LABEL org.opencontainers.image.description="Virtual DSM in a docker container"
|
LABEL org.opencontainers.image.description="Virtual DSM in a docker container"
|
||||||
|
|
||||||
HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh
|
HEALTHCHECK --interval=60s --retries=2 CMD /run/check.sh
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -u
|
set -u
|
||||||
|
|
||||||
VERSION="7"
|
VERSION="8"
|
||||||
HEADER="VirtualDSM Agent"
|
HEADER="VirtualDSM Agent"
|
||||||
|
|
||||||
# Functions
|
# Functions
|
||||||
@@ -38,7 +38,7 @@ function downloadUpdate {
|
|||||||
|
|
||||||
# Auto update the agent
|
# Auto update the agent
|
||||||
|
|
||||||
URL="https://raw.githubusercontent.com/kroese/virtual-dsm/master/agent/agent.sh"
|
URL="https://raw.githubusercontent.com/vdsm/virtual-dsm/master/agent/agent.sh"
|
||||||
|
|
||||||
remote_size=$(curl -sIk -m 4 "${URL}" | grep -i "content-length:" | tr -d " \t" | cut -d ':' -f 2)
|
remote_size=$(curl -sIk -m 4 "${URL}" | grep -i "content-length:" | tr -d " \t" | cut -d ':' -f 2)
|
||||||
remote_size=${remote_size//$'\r'}
|
remote_size=${remote_size//$'\r'}
|
||||||
@@ -100,6 +100,8 @@ function installPackages {
|
|||||||
trap finish SIGINT SIGTERM
|
trap finish SIGINT SIGTERM
|
||||||
|
|
||||||
ts=$(date +%s%N)
|
ts=$(date +%s%N)
|
||||||
|
|
||||||
|
echo ""
|
||||||
echo "❯ Started $HEADER v$VERSION..."
|
echo "❯ Started $HEADER v$VERSION..."
|
||||||
|
|
||||||
checkNMI
|
checkNMI
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ start() {
|
|||||||
|
|
||||||
if [ ! -f "$SCRIPT" ]; then
|
if [ ! -f "$SCRIPT" ]; then
|
||||||
|
|
||||||
URL="https://raw.githubusercontent.com/kroese/virtual-dsm/master/agent/agent.sh"
|
URL="https://raw.githubusercontent.com/vdsm/virtual-dsm/master/agent/agent.sh"
|
||||||
|
|
||||||
if ! curl -sfk -m 10 -o "${SCRIPT}" "${URL}"; then
|
if ! curl -sfk -m 10 -o "${SCRIPT}" "${URL}"; then
|
||||||
error 'Failed to download agent script.' > /dev/ttyS0
|
error 'Failed to download agent script.' > /dev/ttyS0
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ version: "3"
|
|||||||
services:
|
services:
|
||||||
dsm:
|
dsm:
|
||||||
container_name: dsm
|
container_name: dsm
|
||||||
image: kroese/virtual-dsm:latest
|
image: vdsm/virtual-dsm:latest
|
||||||
environment:
|
environment:
|
||||||
CPU_CORES: "1"
|
CPU_CORES: "1"
|
||||||
DISK_SIZE: "16G"
|
DISK_SIZE: "16G"
|
||||||
|
|||||||
18
readme.md
18
readme.md
@@ -1,6 +1,6 @@
|
|||||||
<h1 align="center">Virtual DSM for Docker<br />
|
<h1 align="center">Virtual DSM for Docker<br />
|
||||||
<div align="center">
|
<div align="center">
|
||||||
<img src="https://github.com/kroese/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" />
|
<img src="https://github.com/vdsm/virtual-dsm/raw/master/.github/screen.jpg" title="Screenshot" style="max-width:100%;" width="432" />
|
||||||
</div>
|
</div>
|
||||||
<div align="center">
|
<div align="center">
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ version: "3"
|
|||||||
services:
|
services:
|
||||||
dsm:
|
dsm:
|
||||||
container_name: dsm
|
container_name: dsm
|
||||||
image: kroese/virtual-dsm:latest
|
image: vdsm/virtual-dsm:latest
|
||||||
environment:
|
environment:
|
||||||
DISK_SIZE: "16G"
|
DISK_SIZE: "16G"
|
||||||
devices:
|
devices:
|
||||||
@@ -48,7 +48,7 @@ services:
|
|||||||
Via `docker run`
|
Via `docker run`
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 60 kroese/virtual-dsm:latest
|
docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-timeout 60 vdsm/virtual-dsm:latest
|
||||||
```
|
```
|
||||||
|
|
||||||
## FAQ
|
## FAQ
|
||||||
@@ -198,11 +198,11 @@ docker run -it --rm -p 5000:5000 --device=/dev/kvm --cap-add NET_ADMIN --stop-ti
|
|||||||
|
|
||||||
Only run this container on Synology hardware, any other use is not permitted by their EULA. The product names, logos, brands, and other trademarks referred to within this project are the property of their respective trademark holders. This project is not affiliated, sponsored, or endorsed by Synology, Inc.
|
Only run this container on Synology hardware, any other use is not permitted by their EULA. The product names, logos, brands, and other trademarks referred to within this project are the property of their respective trademark holders. This project is not affiliated, sponsored, or endorsed by Synology, Inc.
|
||||||
|
|
||||||
[build_url]: https://github.com/kroese/virtual-dsm/
|
[build_url]: https://github.com/vdsm/virtual-dsm/
|
||||||
[hub_url]: https://hub.docker.com/r/kroese/virtual-dsm
|
[hub_url]: https://hub.docker.com/r/vdsm/virtual-dsm
|
||||||
[tag_url]: https://hub.docker.com/r/kroese/virtual-dsm/tags
|
[tag_url]: https://hub.docker.com/r/vdsm/virtual-dsm/tags
|
||||||
|
|
||||||
[Build]: https://github.com/kroese/virtual-dsm/actions/workflows/build.yml/badge.svg
|
[Build]: https://github.com/vdsm/virtual-dsm/actions/workflows/build.yml/badge.svg
|
||||||
[Size]: https://img.shields.io/docker/image-size/kroese/virtual-dsm/latest?color=066da5&label=size
|
[Size]: https://img.shields.io/docker/image-size/vdsm/virtual-dsm/latest?color=066da5&label=size
|
||||||
[Pulls]: https://img.shields.io/docker/pulls/kroese/virtual-dsm.svg?style=flat&label=pulls&logo=docker
|
[Pulls]: https://img.shields.io/docker/pulls/kroese/virtual-dsm.svg?style=flat&label=pulls&logo=docker
|
||||||
[Version]: https://img.shields.io/docker/v/kroese/virtual-dsm/latest?arch=amd64&sort=semver&color=066da5
|
[Version]: https://img.shields.io/docker/v/vdsm/virtual-dsm/latest?arch=amd64&sort=semver&color=066da5
|
||||||
|
|||||||
Reference in New Issue
Block a user