x/packetary
Code Issues Proposed changes

Remove privileged from docker config

Browse Source
This commit is contained in:
Vitaly Parakhin 2015-05-13 16:14:19 +03:00
parent 178a5da351
commit e21e33bd9f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/mos-ubuntu-updatesonly.cfg
View File

@ -6,8 +6,8 @@ UPSTREAM="mirror.fuel-infra.org"
UPSTREAM_DIR="mirror/mos/ubuntu"
UPSTREAM_DIR_HTTP="mos/ubuntu"
# PARTIAL_UPSTREAM=1 : sync full upstream repository
# PARTIAL_UPSTREAM=0 : sync only upstream packages required by MOS
# PARTIAL_UPSTREAM=0 : sync full upstream repository
# PARTIAL_UPSTREAM=1 : sync only upstream packages required by MOS
PARTIAL_UPSTREAM=0
# Sync destination

4
config/mos-ubuntu.cfg
View File

@ -6,8 +6,8 @@ UPSTREAM="mirror.fuel-infra.org"
UPSTREAM_DIR="mirror/mos/ubuntu"
UPSTREAM_DIR_HTTP="mos/ubuntu"
# PARTIAL_UPSTREAM=1 : sync full upstream repository
# PARTIAL_UPSTREAM=0 : sync only upstream packages required by MOS
# PARTIAL_UPSTREAM=0 : sync full upstream repository
# PARTIAL_UPSTREAM=1 : sync only upstream packages required by MOS
PARTIAL_UPSTREAM=0
# Sync destination

4
config/ubuntu.cfg
View File

@ -9,8 +9,8 @@ UPSTREAM_DIR_HTTP=${UPSTREAM_DIR}
# Sync destination
LOCAL_DIR="${MIRROR_ROOT:-"/var/www/nailgun"}/ubuntu-full"
# PARTIAL_UPSTREAM=1 : sync full upstream repository
# PARTIAL_UPSTREAM=0 : sync only upstream packages required by MOS
# PARTIAL_UPSTREAM=0 : sync full upstream repository
# PARTIAL_UPSTREAM=1 : sync only upstream packages required by MOS
PARTIAL_UPSTREAM=1
# Destionation for partial upstream mirror

4
deb-mirror
View File

@ -474,7 +474,7 @@ export BINROOT
if [[ "$DOCKER_MODE" = "true" ]]; then
( docker ps -a | grep fuel-createmirror ) && docker rm -f fuel-createmirror
# docker pull ubuntu:latest
docker -D run -d --name=fuel-createmirror --net=host -a stdout -a stderr -i -t --privileged \
docker -D run -d --name=fuel-createmirror --net=host -a stdout -a stderr -t \
-e UBUNTU_RELEASE=$UBUNTU_RELEASE -e UBUNTU_NETBOOT_FLAVOR=$UBUNTU_NETBOOT_FLAVOR \
-e UBUNTU_ARCH=$UBUNTU_ARCH -e FUEL_BRANCH=$FUEL_BRANCH -e BINROOT=$BINROOT \
-e apt_altstate=$apt_altstate -v $BINROOT:$BINROOT:rw -v $apt_altstate:$apt_altstate:rw ubuntu:latest
@ -585,7 +585,6 @@ mkdir -p ${PARTIAL_UPSTREAM_PATH}/indices
mkdir -p ${PARTIAL_UPSTREAM_PATH}/dists/${UBUNTU_RELEASE}/main/binary-amd64
mkdir -p ${PARTIAL_UPSTREAM_PATH}/dists/${UBUNTU_RELEASE}/main/debian-installer/binary-amd64
mkdir -p ${PARTIAL_UPSTREAM_PATH}/${INITRD_DIR}
find ${PARTIAL_UPSTREAM_PATH} -type d -print0 | xargs -0 chmod 755
temp_dir=`mktemp -d --suffix="-reposync"`
find $LOCAL_DIR/pool/ -name *.deb -type f -exec cp -vuni '{}' ${temp_dir} ";"
rsync -a --delete ${temp_dir}/ ${PARTIAL_UPSTREAM_PATH}/pool/main
@ -594,6 +593,7 @@ find ${LOCAL_DIR}/pool/ -name *.udeb -type f -exec cp -vuni '{}' ${temp_dir} ";"
rsync -a --delete ${temp_dir}/ ${PARTIAL_UPSTREAM_PATH}/pool/debian-installer
rm -rf ${temp_dir}
rsync -a --delete ${LOCAL_DIR}/${INITRD_DIR}/ ${PARTIAL_UPSTREAM_PATH}/${INITRD_DIR}
find ${PARTIAL_UPSTREAM_PATH} -type d -print0 | xargs -0 chmod 755
# Generate "indices" folder
cat $LOCAL_DIR/indices/*extra* | sort -u > ${PARTIAL_UPSTREAM_PATH}/indices/override.${UBUNTU_RELEASE}.extra.main