Skip to content

Commit 7d42a2a

Browse files
authored
Merge branch 'master' into mfff-new-settings
2 parents 78d2ea1 + 8863ec0 commit 7d42a2a

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

docker_env/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM registry.hub.docker.com/library/debian:buster-slim
1+
FROM --platform=linux/amd64 registry.hub.docker.com/library/debian:buster
22

33
LABEL Maintainer="software-embedded-platform@ultimaker.com" \
44
Comment="Ultimaker update-tools filesystem"
55

6-
RUN apt-get update && apt-get -y install cmake make python3 python3-pip git
6+
RUN apt-get update && apt-get -y install cmake make python3 python3-pip git libxml2-dev libxslt-dev
77

88
COPY docker_env/buildenv_check.sh buildenv_check.sh
99

1010
COPY fdm_requirements.txt fdm_requirements.txt
1111

12-
RUN pip3 install -r fdm_requirements.txt
12+
RUN pip3 install -r fdm_requirements.txt

fdm_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
lxml
1+
lxml==4.6.5

0 commit comments

Comments
 (0)