Skip to content

Commit ce54cd2

Browse files
committed
Merge pull request #25 from infosiftr/simpler-cross-loop
Simplify "cross" loops
2 parents 455b15a + acc4ed5 commit ce54cd2

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

1.2/cross/Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ ENV GOLANG_CROSSPLATFORMS \
1919
# (set an explicit GOARM of 5 for maximum ARM compatibility)
2020
ENV GOARM 5
2121

22-
RUN bash -xec '\
23-
cd /usr/src/go/src; \
24-
for platform in $GOLANG_CROSSPLATFORMS; do \
25-
GOOS=${platform%/*} \
26-
GOARCH=${platform##*/} \
27-
./make.bash --no-clean 2>&1; \
28-
done \
29-
'
22+
RUN cd /usr/src/go/src \
23+
&& set -ex \
24+
&& for platform in $GOLANG_CROSSPLATFORMS; do \
25+
GOOS=${platform%/*} \
26+
GOARCH=${platform##*/} \
27+
./make.bash --no-clean 2>&1; \
28+
done

1.3/cross/Dockerfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ ENV GOLANG_CROSSPLATFORMS \
2121
# (set an explicit GOARM of 5 for maximum ARM compatibility)
2222
ENV GOARM 5
2323

24-
RUN bash -xec '\
25-
cd /usr/src/go/src; \
26-
for platform in $GOLANG_CROSSPLATFORMS; do \
27-
GOOS=${platform%/*} \
28-
GOARCH=${platform##*/} \
29-
./make.bash --no-clean 2>&1; \
30-
done \
31-
'
24+
RUN cd /usr/src/go/src \
25+
&& set -ex \
26+
&& for platform in $GOLANG_CROSSPLATFORMS; do \
27+
GOOS=${platform%/*} \
28+
GOARCH=${platform##*/} \
29+
./make.bash --no-clean 2>&1; \
30+
done

0 commit comments

Comments
 (0)