mirror of
https://github.com/dockur/windows.git
synced 2025-12-16 04:03:04 +00:00
chore: split compose into separate files
- Split compose.yml into two files: compose.yml for running and compose.prepare.yml for golden image preparation - Rename env vars STORAGE->STORAGE_DIR and ISO->ISO_FILE to avoid conflicts with internal script variables - Remove unused VERSION env var (hardcoded in scripts) - Update README with new command syntax
This commit is contained in:
parent
f80bb8202c
commit
e241426eea
@ -41,6 +41,5 @@ EXPOSE 3389 8006
|
|||||||
ENV RAM_SIZE="4G"
|
ENV RAM_SIZE="4G"
|
||||||
ENV CPU_CORES="2"
|
ENV CPU_CORES="2"
|
||||||
ENV DISK_SIZE="30G"
|
ENV DISK_SIZE="30G"
|
||||||
ENV VERSION="win11e"
|
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
|
ENTRYPOINT ["/usr/bin/tini", "-s", "/run/entry.sh"]
|
||||||
|
|||||||
19
compose.prepare.yml
Normal file
19
compose.prepare.yml
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
services:
|
||||||
|
prepare-windows:
|
||||||
|
image: windows-local:latest
|
||||||
|
container_name: prepare-windows
|
||||||
|
environment:
|
||||||
|
ISO_FILE: "${ISO_FILE:?Error: required env var not set}"
|
||||||
|
STORAGE_DIR: "${STORAGE_DIR:?Error: required env var not set}"
|
||||||
|
devices:
|
||||||
|
- /dev/kvm
|
||||||
|
cap_add:
|
||||||
|
- NET_ADMIN
|
||||||
|
ports:
|
||||||
|
- 8006:8006
|
||||||
|
- 3389:3389/tcp
|
||||||
|
- 3389:3389/udp
|
||||||
|
stop_grace_period: 2m
|
||||||
|
volumes:
|
||||||
|
- ${ISO_FILE}:/custom.iso
|
||||||
|
- ${STORAGE_DIR}:/storage
|
||||||
16
compose.yml
16
compose.yml
@ -3,8 +3,7 @@ services:
|
|||||||
image: windows-local:latest
|
image: windows-local:latest
|
||||||
container_name: windows
|
container_name: windows
|
||||||
environment:
|
environment:
|
||||||
VERSION: "win11e"
|
STORAGE_DIR: "${STORAGE_DIR:?Error: required env var not set}"
|
||||||
STORAGE: "${STORAGE:?Error: required env var not set}"
|
|
||||||
devices:
|
devices:
|
||||||
- /dev/kvm
|
- /dev/kvm
|
||||||
cap_add:
|
cap_add:
|
||||||
@ -15,15 +14,4 @@ services:
|
|||||||
- 3389:3389/udp
|
- 3389:3389/udp
|
||||||
stop_grace_period: 2m
|
stop_grace_period: 2m
|
||||||
volumes:
|
volumes:
|
||||||
- ${STORAGE}:/storage
|
- ${STORAGE_DIR}:/storage
|
||||||
|
|
||||||
prepare-golden-image:
|
|
||||||
extends:
|
|
||||||
service: windows
|
|
||||||
profiles:
|
|
||||||
- prepare-golden-image
|
|
||||||
environment:
|
|
||||||
ISO: "${ISO:?Error: required env var not set}"
|
|
||||||
volumes:
|
|
||||||
- ${ISO}:/custom.iso
|
|
||||||
- ${STORAGE}:/storage
|
|
||||||
|
|||||||
@ -16,13 +16,13 @@ Local Windows inside a Docker container.
|
|||||||
|
|
||||||
To prepare a golden image from a custom ISO:
|
To prepare a golden image from a custom ISO:
|
||||||
```bash
|
```bash
|
||||||
STORAGE=/path/to/storage ISO=/path/to/custom.iso \
|
STORAGE_DIR=/path/to/storage ISO_FILE=/path/to/custom.iso \
|
||||||
docker compose --profile prepare-golden-image up
|
docker compose -f compose.prepare.yml up
|
||||||
```
|
```
|
||||||
|
|
||||||
Start the container:
|
Start the container (using the golden image):
|
||||||
```bash
|
```bash
|
||||||
STORAGE=/path/to/storage docker compose up
|
STORAGE_DIR=/path/to/storage docker compose up
|
||||||
```
|
```
|
||||||
|
|
||||||
### Via Docker CLI:
|
### Via Docker CLI:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user