Skip to content

Commit 74a9d28

Browse files
committed
Update Travis, generate-stackbrew-library.sh, management Dockerfiles, and update.sh
1 parent 13c6386 commit 74a9d28

File tree

4 files changed

+53
-23
lines changed

4 files changed

+53
-23
lines changed

.travis.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
language: bash
22
services: docker
33

4+
env:
5+
- VARIANT=debian
6+
- VARIANT=alpine
7+
48
install:
59
- git clone https://github.com/docker-library/official-images.git ~/official-images
610

711
before_script:
812
- env | sort
9-
- image='rabbitmq'
13+
- image="rabbitmq:$VARIANT"
1014

1115
script:
12-
- docker build -t "$image" .
16+
- docker build -t "$image" "$VARIANT"
1317
- ~/official-images/test/run.sh "$image"
14-
- docker build -t "$image:management" management
15-
- ~/official-images/test/run.sh "$image:management"
18+
- docker build -t "${image}-management" "$VARIANT/management"
19+
- ~/official-images/test/run.sh "${image}-management"
1620

1721
after_script:
1822
- docker images

alpine/management/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM rabbitmq:alpine
2+
3+
RUN rabbitmq-plugins enable --offline rabbitmq_management
4+
5+
EXPOSE 15671 15672

generate-stackbrew-library.sh

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#!/bin/bash
22
set -eu
33

4+
defaultVariant='debian'
5+
46
self="$(basename "$BASH_SOURCE")"
57
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
68

@@ -41,33 +43,50 @@ join() {
4143
echo "${out#$sep}"
4244
}
4345

44-
commit="$(dirCommit .)"
45-
46-
fullVersion="$(git show "$commit":Dockerfile | awk '$1 == "ENV" && $2 == "RABBITMQ_VERSION" { print $3; exit }')"
47-
48-
versionAliases=()
49-
while [ "${fullVersion%.*}" != "$fullVersion" ]; do
50-
versionAliases+=( $fullVersion )
51-
fullVersion="${fullVersion%.*}"
52-
done
53-
versionAliases+=( $fullVersion latest )
46+
for variant in debian alpine; do
47+
commit="$(dirCommit "$variant")"
5448

55-
echo
56-
cat <<-EOE
57-
Tags: $(join ', ' "${versionAliases[@]}")
58-
GitCommit: $commit
59-
EOE
49+
fullVersion="$(git show "$commit":"$variant/Dockerfile" | awk '$1 == "ENV" && $2 == "RABBITMQ_VERSION" { print $3; exit }')"
6050

61-
for variant in management; do
62-
commit="$(dirCommit "$variant")"
51+
versionAliases=()
52+
while [ "${fullVersion%.*}" != "$fullVersion" ]; do
53+
versionAliases+=( $fullVersion )
54+
fullVersion="${fullVersion%.*}"
55+
done
56+
versionAliases+=(
57+
$fullVersion
58+
latest
59+
)
6360

6461
variantAliases=( "${versionAliases[@]/%/-$variant}" )
6562
variantAliases=( "${variantAliases[@]//latest-/}" )
6663

64+
if [ "$variant" = "$defaultVariant" ]; then
65+
variantAliases=( "${versionAliases[@]}" )
66+
fi
67+
6768
echo
6869
cat <<-EOE
6970
Tags: $(join ', ' "${variantAliases[@]}")
7071
GitCommit: $commit
7172
Directory: $variant
7273
EOE
74+
75+
for subVariant in management; do
76+
commit="$(dirCommit "$variant/$subVariant")"
77+
78+
subVariantAliases=( "${versionAliases[@]/%/-$subVariant}" )
79+
subVariantAliases=( "${subVariantAliases[@]//latest-/}" )
80+
81+
if [ "$variant" != "$defaultVariant" ]; then
82+
subVariantAliases=( "${subVariantAliases[@]/%/-$variant}" )
83+
fi
84+
85+
echo
86+
cat <<-EOE
87+
Tags: $(join ', ' "${subVariantAliases[@]}")
88+
GitCommit: $commit
89+
Directory: $variant/$subVariant
90+
EOE
91+
done
7392
done

update.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,7 @@ debianVersion="$(curl -sSL 'http://www.rabbitmq.com/debian/dists/testing/main/bi
88
rabbitmqVersion="${debianVersion%%-*}"
99

1010
set -x
11-
sed -ri 's/^(ENV RABBITMQ_VERSION) .*/\1 '"$rabbitmqVersion"'/' debian/Dockerfile
12-
sed -ri 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 '"$debianVersion"'/' debian/Dockerfile
11+
sed -ri \
12+
-e 's/^(ENV RABBITMQ_VERSION) .*/\1 '"$rabbitmqVersion"'/' \
13+
-e 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 '"$debianVersion"'/' \
14+
*/Dockerfile

0 commit comments

Comments
 (0)