Skip to content

Commit b92b2cf

Browse files
authored
Refactor/fix Docker (#218)
1 parent e17a804 commit b92b2cf

File tree

3 files changed

+18
-23
lines changed

3 files changed

+18
-23
lines changed

Dockerfile.dev

+14-19
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bullseye
1+
FROM python:3.10-slim-bullseye
22

33
# Set shell
44
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -9,30 +9,25 @@ RUN \
99
set -x \
1010
&& apt-get update \
1111
&& apt-get install -y --no-install-recommends \
12-
libuv1 \
13-
openssl \
14-
zlib1g \
15-
libjson-c5 \
16-
python3-venv \
17-
python3-pip \
18-
python3-gi \
19-
python3-gi-cairo \
20-
python3-dbus \
21-
python3-psutil \
22-
unzip \
23-
libcairo2 \
24-
gdb \
25-
git \
12+
libuv1 \
13+
openssl \
14+
zlib1g \
15+
libjson-c5 \
16+
unzip \
17+
libcairo2 \
18+
gdb \
19+
git \
2620
&& git clone --depth 1 -b master \
27-
https://github.com/project-chip/connectedhomeip \
21+
https://github.com/project-chip/connectedhomeip \
2822
&& cp -r connectedhomeip/credentials /app/credentials \
2923
&& mv /app/credentials/production/paa-root-certs/* \
3024
/app/credentials/development/paa-root-certs/ \
3125
&& rm -rf connectedhomeip \
3226
&& apt-get purge -y --auto-remove \
33-
git \
34-
&& rm -rf /var/lib/apt/lists/* \
35-
&& rm -rf /usr/src/*
27+
git \
28+
&& rm -rf \
29+
/var/lib/apt/lists/* \
30+
/usr/src/*
3631

3732

3833
COPY . ./

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -198,12 +198,12 @@ Please note that development is only possible on Linux and MacOS, no Windows sup
198198
### Build
199199

200200
```sh
201-
docker-compose build --no-cache matter-server
201+
docker compose build --no-cache
202202
```
203203

204204
### Run
205205

206206
```sh
207-
docker-compose up -d matter-server
208-
docker-compose logs -f matter-server
207+
docker compose up -d
208+
docker compose logs -f
209209
```

docker-compose.yml compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
# Required for mDNS to work correctly
1212
network_mode: host
1313
security_opt:
14-
# needed for bluetooth via dbus
14+
# Needed for Bluetooth via dbus
1515
- apparmor:unconfined
1616
volumes:
1717
# Create an .env file that sets the USERDIR environment variable.

0 commit comments

Comments
 (0)