mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Repository should also have i386 index, since Ubuntu is multi-arch by default
This commit is contained in:
parent
abfa7a204d
commit
87872006ce
2 changed files with 4 additions and 3 deletions
5
make.sh
5
make.sh
|
@ -35,6 +35,7 @@ VERSION=$(cat ./VERSION)
|
||||||
GIT_COMMIT=$(git rev-parse --short HEAD)
|
GIT_COMMIT=$(git rev-parse --short HEAD)
|
||||||
GIT_CHANGES=$(test -n "$(git status --porcelain)" && echo "+CHANGES" || true)
|
GIT_CHANGES=$(test -n "$(git status --porcelain)" && echo "+CHANGES" || true)
|
||||||
|
|
||||||
|
PACKAGE_ARCHITECTURE="$(dpkg-architecture -qDEB_HOST_ARCH)"
|
||||||
PACKAGE_URL="http://www.docker.io/"
|
PACKAGE_URL="http://www.docker.io/"
|
||||||
PACKAGE_MAINTAINER="docker@dotcloud.com"
|
PACKAGE_MAINTAINER="docker@dotcloud.com"
|
||||||
PACKAGE_DESCRIPTION="lxc-docker is a Linux container runtime
|
PACKAGE_DESCRIPTION="lxc-docker is a Linux container runtime
|
||||||
|
@ -99,7 +100,7 @@ EOF
|
||||||
cd bundles/$VERSION/ubuntu
|
cd bundles/$VERSION/ubuntu
|
||||||
fpm -s dir -C $DIR \
|
fpm -s dir -C $DIR \
|
||||||
--name lxc-docker-$VERSION --version $VERSION \
|
--name lxc-docker-$VERSION --version $VERSION \
|
||||||
--architecture $(dpkg-architecture -qDEB_HOST_ARCH) \
|
--architecture "$PACKAGE_ARCHITECTURE" \
|
||||||
--prefix / \
|
--prefix / \
|
||||||
--depends lxc --depends aufs-tools \
|
--depends lxc --depends aufs-tools \
|
||||||
--description "$PACKAGE_DESCRIPTION" \
|
--description "$PACKAGE_DESCRIPTION" \
|
||||||
|
@ -113,7 +114,7 @@ EOF
|
||||||
mkdir empty
|
mkdir empty
|
||||||
fpm -s dir -C empty \
|
fpm -s dir -C empty \
|
||||||
--name lxc-docker --version $VERSION \
|
--name lxc-docker --version $VERSION \
|
||||||
--architecture all \
|
--architecture "$PACKAGE_ARCHITECTURE" \
|
||||||
--depends lxc-docker-$VERSION \
|
--depends lxc-docker-$VERSION \
|
||||||
--description "$PACKAGE_DESCRIPTION" \
|
--description "$PACKAGE_DESCRIPTION" \
|
||||||
--maintainer "$PACKAGE_MAINTAINER" \
|
--maintainer "$PACKAGE_MAINTAINER" \
|
||||||
|
|
|
@ -76,7 +76,7 @@ release_ubuntu() {
|
||||||
cat > $APTDIR/conf/distributions <<EOF
|
cat > $APTDIR/conf/distributions <<EOF
|
||||||
Codename: docker
|
Codename: docker
|
||||||
Components: main
|
Components: main
|
||||||
Architectures: amd64
|
Architectures: amd64 i386
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# Add the DEB package to the APT repo
|
# Add the DEB package to the APT repo
|
||||||
|
|
Loading…
Add table
Reference in a new issue