mirror of
https://github.com/kasmtech/kasm-workspaces-dind.git
synced 2026-01-23 02:35:11 +00:00
Merge branch 'feature/KASM-4331-113-updates' into 'develop'
KASM-4331 update build logic and tag references Closes KASM-4331 See merge request kasm-technologies/internal/kasm_workspaces_dind!6
This commit is contained in:
commit
598268f914
2 changed files with 16 additions and 4 deletions
14
Dockerfile
14
Dockerfile
|
|
@ -28,7 +28,6 @@ RUN \
|
|||
containerd.io \
|
||||
docker-ce \
|
||||
docker-ce-cli \
|
||||
docker-compose-plugin \
|
||||
drm-info \
|
||||
e2fsprogs \
|
||||
fuse-overlayfs \
|
||||
|
|
@ -36,6 +35,7 @@ RUN \
|
|||
gcc \
|
||||
iptables \
|
||||
jq \
|
||||
lsof \
|
||||
make \
|
||||
nodejs \
|
||||
nvidia-docker2 \
|
||||
|
|
@ -45,6 +45,12 @@ RUN \
|
|||
sudo \
|
||||
uidmap \
|
||||
xfsprogs && \
|
||||
echo "**** compose install ****" && \
|
||||
mkdir -p /usr/local/lib/docker/cli-plugins && \
|
||||
curl -L \
|
||||
https://github.com/docker/compose/releases/download/v2.5.0/docker-compose-$(uname -s)-$(uname -m) -o \
|
||||
/usr/local/lib/docker/cli-plugins/docker-compose && \
|
||||
chmod +x /usr/local/lib/docker/cli-plugins/docker-compose && \
|
||||
echo "**** dind setup ****" && \
|
||||
useradd -U dockremap && \
|
||||
usermod -G dockremap dockremap && \
|
||||
|
|
@ -86,6 +92,12 @@ RUN \
|
|||
tar xf \
|
||||
/tmp/kasm.tar.gz -C \
|
||||
/ && \
|
||||
curl -o \
|
||||
/tmp/images.tar.gz -L \
|
||||
"https://kasm-ci.s3.amazonaws.com/1.13.0-images-combined.tar.gz" && \
|
||||
tar xf \
|
||||
/tmp/images.tar.gz -C \
|
||||
/ && \
|
||||
echo "**** copy assets ****" && \
|
||||
cp \
|
||||
/kasm_release/www/img/thumbnails/*.png /kasm_release/www/img/thumbnails/*.svg \
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ It has a few core principles:
|
|||
version: "2.1"
|
||||
services:
|
||||
kasm:
|
||||
image: kasmweb/workspaces:1.12.0
|
||||
image: kasmweb/workspaces:1.13.0
|
||||
privileged: true
|
||||
container_name: kasm
|
||||
environment:
|
||||
|
|
@ -51,7 +51,7 @@ docker run -d \
|
|||
-v /path/to/profiles:/profiles `#optional` \
|
||||
-v /dev/input:/dev/input `#optional` \
|
||||
-v /run/udev/data:/run/udev/data `#optional` \
|
||||
kasmweb/workspaces:1.11.0
|
||||
kasmweb/workspaces:1.13.0
|
||||
```
|
||||
|
||||
| Parameter | Function |
|
||||
|
|
@ -71,7 +71,7 @@ docker run -d \
|
|||
|
||||
| Tag | Description |
|
||||
| :----: | --- |
|
||||
| 1.12.0 | Latest stable release |
|
||||
| 1.13.0 | Latest stable release |
|
||||
| develop | Development head |
|
||||
|
||||
| Architecture | Tag |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue