Skip to content

Commit

Permalink
Create build-deps.txt, ship them in the container too
Browse files Browse the repository at this point in the history
Just like how we split out an easily machine-readable `deps.txt`,
do the same for our build dependencies.

However as part of adding a new developer flow to this container,
do ship those dependencies.

Ref: #75
  • Loading branch information
cgwalters authored and jlebon committed Sep 24, 2018
1 parent d9066c0 commit 424b49b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 2 additions & 0 deletions build-deps.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Used by mantle
golang
13 changes: 8 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,12 @@ dnf copr -y enable walters/buildtools-fedora
# For now, since we get builds slightly faster there
dnf copr -y enable dustymabe/ignition

# These are only used to build things in here, we define them separately because
# they're cleaned up later
self_builddeps="cargo golang"
# These are only used to build things in here. Today
# we ship these in the container too to make it easier
# to use the container as a development environment for itself.
# Down the line we may strip these out, or have a separate
# development version.
self_builddeps=$(grep -v '^#' ${srcdir}/build-deps.txt)

# Process our base dependencies + build dependencies
(echo ${self_builddeps} && grep -v '^#' ${srcdir}/deps.txt) | xargs dnf -y install
Expand All @@ -56,8 +59,8 @@ rsync -rlv ${srcdir}/ostree-releng-scripts/ /usr/app/ostree-releng-scripts/
# And the main scripts
make && make install

# Cleanup deps
dnf remove -y ${self_builddeps}
# Commented out for now, see above
#dnf remove -y ${self_builddeps}
rpm -q grubby && dnf remove -y grubby
# Further cleanup
dnf clean all
Expand Down

0 comments on commit 424b49b

Please sign in to comment.