Skip to content
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

Jump to bottom

Simpler image building #102

Merged
merged 4 commits into from
Dec 24, 2020
Merged

Simpler image building #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b38aaed
simplify image building
alsuren Dec 22, 2020
b1d0a61
set PKG_CONFIG_PATH correctly
alsuren Dec 22, 2020
468c113
remove 'as context'
alsuren Dec 22, 2020
80f07b4
fix dockerfile names in Cross.toml
alsuren Dec 22, 2020
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
12 changes: 6 additions & 6 deletions Cross.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Based on https://www.collabora.com/news-and-blog/blog/2020/06/23/cross-building-rust-gstreamer-plugins-for-the-raspberry-pi/
# but with `RUN apt-get install -y libdbus-1-dev:armhf` thrown in to get the dependency we need.
# This image has been pushed to dockerhub.
image = "alsuren/xiaomi-temp-rpi-builder"
image = "alsuren/cross-dbus:armv7-unknown-linux-gnu-0.2.1"


# Once https://github.com/rust-embedded/cross/pull/446 gets somewhere, you
Expand All @@ -11,16 +11,16 @@ image = "alsuren/xiaomi-temp-rpi-builder"
# cargo install --git=https://github.com/alsuren/cross --branch=docker-build-context
# and then comment out `image`, above and uncomment the following two lines:
# context = "./docker"
# dockerfile = "./docker/Dockerfile.buster-gst-armv7-unknown-linux-gnueabihf"
# dockerfile = "./docker/Dockerfile.dbus.armv7-unknown-linux-gnueabihf"

[target.aarch64-unknown-linux-gnu]
image = "alsuren/xiaomi-temp-aarch64-builder"
image = "alsuren/cross-dbus:aarch64-unknown-linux-gnu-0.2.1"

# context = "./docker"
# dockerfile = "./docker/Dockerfile.buster-gst-aarch64-unknown-linux-gnu"
# dockerfile = "./docker/Dockerfile.dbus.aarch64-unknown-linux-gnu"

[target.x86_64-unknown-linux-gnu]
image = "alsuren/xiaomi-temp-x86_64-builder"
image = "alsuren/cross-dbus:x86_64-unknown-linux-gnu-0.2.1"

# context = "./docker"
# dockerfile = "./docker/Dockerfile.buster-gst-x86_64-unknown-linux-gnu"
# dockerfile = "./docker/Dockerfile.dbus.x86_64-unknown-linux-gnu"
27 changes: 0 additions & 27 deletions docker/Dockerfile.buster-gst-aarch64-unknown-linux-gnu
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions docker/Dockerfile.buster-gst-armv7-unknown-linux-gnueabihf
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions docker/Dockerfile.buster-gst-x86_64-unknown-linux-gnu
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions docker/Dockerfile.dbus.aarch64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM rustembedded/cross:aarch64-unknown-linux-gnu-0.2.1

RUN dpkg --add-architecture arm64 && \
apt-get update && \
apt-get install -y libssl-dev:arm64 libdbus-1-dev:arm64

ENV PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig
7 changes: 7 additions & 0 deletions docker/Dockerfile.dbus.armv7-unknown-linux-gnueabihf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM rustembedded/cross:armv7-unknown-linux-gnueabihf-0.2.1

RUN dpkg --add-architecture armhf && \
apt-get update && \
apt-get install -y libssl-dev:armhf libdbus-1-dev:armhf

ENV PKG_CONFIG_PATH=/usr/lib/arm-linux-gnueabihf/pkgconfig
4 changes: 4 additions & 0 deletions docker/Dockerfile.dbus.x86_64-unknown-linux-gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM rustembedded/cross:x86_64-unknown-linux-gnu-0.2.1

RUN apt-get update && \
apt-get install -y libssl-dev libdbus-1-dev