Skip to content

Adjust "erlang-base-hipe" installation to only happen if the package is available #170

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

Merged
merged 1 commit into from
Jun 20, 2017
Merged

Adjust "erlang-base-hipe" installation to only happen if the package is available #170

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
17 changes: 13 additions & 4 deletions 3.6/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,18 @@ RUN set -x \
&& apt-get purge -y --auto-remove ca-certificates wget

# install Erlang
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
RUN set -ex; \
apt-get update; \
# "erlang-base-hipe" is optional (and only supported on a few arches)
# so, only install it if it's available for our current arch
if apt-cache show erlang-base-hipe 2>/dev/null | grep -q 'Package: erlang-base-hipe'; then \
apt-get install -y --no-install-recommends \
erlang-base-hipe \
; \
fi; \
# we start with "erlang-base-hipe" because it and "erlang-base" (non-hipe) are exclusive
apt-get install -y --no-install-recommends \
erlang-asn1 \
erlang-base-hipe \
erlang-crypto \
erlang-eldap \
erlang-inets \
Expand All @@ -39,7 +47,8 @@ RUN apt-get update \
erlang-public-key \
erlang-ssl \
erlang-xmerl \
&& rm -rf /var/lib/apt/lists/*
; \
rm -rf /var/lib/apt/lists/*

# get logs to stdout (thanks @dumbbell for pushing this upstream! :D)
ENV RABBITMQ_LOGS=- RABBITMQ_SASL_LOGS=-
Expand Down
5 changes: 5 additions & 0 deletions generate-stackbrew-library.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,11 @@ for version in "${versions[@]}"; do
variantParent="$(awk 'toupper($1) == "FROM" { print $2 }' "$version/$variant/Dockerfile")"
variantArches="${parentRepoToArches[$variantParent]}"

if [ "$variant" = 'debian' ]; then
# no ppc64le for now: https://www.rabbitmq.com/debian/dists/testing/Release (no "ppc64el" in "Architectures")
variantArches="$(echo " $variantArches " | sed -r -e 's/ ppc64le / /g')"
fi

echo
cat <<-EOE
Tags: $(join ', ' "${variantAliases[@]}")
Expand Down