Browse Source

Merge pull request #30578 from tophj-ibm/add-p-z-to-release-deb

[ppc64le/s390x] add p/z to release-deb
Victor Vieux 8 năm trước cách đây
mục cha
commit
6365d8dd19
3 tập tin đã thay đổi với 3 bổ sung1 xóa
  1. 1 0
      Dockerfile.ppc64le
  2. 1 0
      Dockerfile.s390x
  3. 1 1
      hack/make/release-deb

+ 1 - 0
Dockerfile.ppc64le

@@ -24,6 +24,7 @@ RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
 # Packaged dependencies
 # Packaged dependencies
 RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
 	apparmor \
 	apparmor \
+	apt-utils \
 	aufs-tools \
 	aufs-tools \
 	automake \
 	automake \
 	bash-completion \
 	bash-completion \

+ 1 - 0
Dockerfile.s390x

@@ -20,6 +20,7 @@ FROM s390x/debian:jessie
 # Packaged dependencies
 # Packaged dependencies
 RUN apt-get update && apt-get install -y \
 RUN apt-get update && apt-get install -y \
 	apparmor \
 	apparmor \
+	apt-utils \
 	aufs-tools \
 	aufs-tools \
 	automake \
 	automake \
 	bash-completion \
 	bash-completion \

+ 1 - 1
hack/make/release-deb

@@ -22,7 +22,7 @@ APTDIR=$DOCKER_RELEASE_DIR/apt/repo
 mkdir -p "$APTDIR/conf" "$APTDIR/db" "$APTDIR/dists"
 mkdir -p "$APTDIR/conf" "$APTDIR/db" "$APTDIR/dists"
 
 
 # supported arches/sections
 # supported arches/sections
-arches=( amd64 i386 armhf )
+arches=( amd64 i386 armhf ppc64le s390x )
 
 
 # Preserve existing components but don't add any non-existing ones
 # Preserve existing components but don't add any non-existing ones
 for component in main testing experimental ; do
 for component in main testing experimental ; do