Skip to content

Commit 99d89f7

Browse files
committed
In dev-image dir
1 parent 04ae3ad commit 99d89f7

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

ci/dev-image/Dockerfile

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
FROM node:12
2+
3+
RUN apt-get update && apt-get install -y \
4+
curl \
5+
iproute2 \
6+
vim \
7+
libgpgme-dev \
8+
iptables \
9+
net-tools \
10+
libsecret-1-dev \
11+
libx11-dev \
12+
libxkbfile-dev
13+
14+
CMD ["/bin/bash"]

m renamed to ci/dev-image/exec.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ container_name=code-server-dev
1010

1111
# Docker build is very verbose even when everything is cached.
1212
echo "--- Building $container_name"
13-
docker build -t $container_name -f ./ci/dev.Dockerfile . > /dev/null
13+
cd ../../ && docker build -t $container_name -f ./ci/dev-image/Dockerfile . > /dev/null
1414

1515
set +e
1616
container_id=$(docker container inspect --format="{{.Id}}" $container_name 2>/dev/null)
@@ -42,7 +42,7 @@ CMD="$@"
4242
docker exec \
4343
$([[ -t 0 ]] && echo -it || true) \
4444
$container_id \
45-
sh -c "$CMD"
45+
bash -c "$CMD"
4646

4747
docker exec \
4848
$([[ -t 0 ]] && echo -it || true) \

ci/dev.Dockerfile

-6
This file was deleted.

doc/CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ yarn watch # Visit http://localhost:8080 once completed.
1313
To develop inside of an isolated docker container:
1414

1515
```shell
16-
./m bash -c 'yarn && yarn vscode && yarn watch' # Visit http://localhost:8080 once completed.
16+
./ci/dev-image/exec.sh bash -c 'yarn && yarn vscode && yarn watch' # Visit http://localhost:8080 once completed.
1717
```
1818

1919
Any changes made to the source will be live reloaded.

0 commit comments

Comments
 (0)