Skip to content

Fix docker build #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SiliconExarch wants to merge 1 commit into
base: qemu-eos-v4.2.1
Choose a base branch
from
Open

Fix docker build #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions magiclantern/docker_builder/dockerfile_2_5_0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
FROM debian:stretch-slim
# NB when updating from Stretch, apt-get needs
# to use python2, not python
FROM debian:bullseye-slim
LABEL description="Magiclantern qemu-eos builder"

# clean is not needed with official Debian images,
Expand All @@ -11,7 +9,7 @@ LABEL description="Magiclantern qemu-eos builder"
RUN apt-get update && \
apt-get install -qy --no-install-recommends \
build-essential \
python \
python2 \
wget \
unzip \
pkg-config \
Expand Down
3 changes: 1 addition & 2 deletions magiclantern/docker_builder/dockerfile_4_2_1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#FROM debian:bullseye-slim
FROM debian:stretch-slim
FROM debian:bullseye-slim
LABEL description="Magiclantern qemu-eos builder"

# clean is not needed with official Debian images,
Expand Down