davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change Fedora-Docker to Fedora_Docker

Browse Source 
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2017-01-05 12:15:44 -06:00
parent 97a1744c4b
commit 14d47ef9bb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-nightly.sh
View File

@ -23,7 +23,7 @@ RSYNCPREFIX="sudo -u ftpsync"
ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX) ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)
ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/" ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"
ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/" ATOMICDEST="/pub/fedora/linux/atomic/$BRANCHED/"
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Docker-25/COMPOSE_ID) OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-25/COMPOSE_ID)
# uncomment and edit for resuming a failed compose # uncomment and edit for resuming a failed compose
#COMPOSE_ID="Fedora-23-20150530.n.0" #COMPOSE_ID="Fedora-23-20150530.n.0"
@ -70,7 +70,7 @@ if [ "$?" = "0" ]; then
export mail=0 export mail=0
fi fi
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-Docker-25/COMPOSE_ID) NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora_Docker-25/COMPOSE_ID)
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g') SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')

6
fedora-docker.conf
View File

@ -1,6 +1,6 @@
# PRODUCT INFO # PRODUCT INFO
release_name = 'Fedora-Docker' release_name = 'Fedora_Docker'
release_short = 'Fedora-Docker' release_short = 'Fedora_Docker'
release_version = '25' release_version = '25'
release_is_layered = False release_is_layered = False
# GENERAL SETTINGS # GENERAL SETTINGS
@ -205,7 +205,7 @@ image_build = {
{ {
'image-build': { 'image-build': {
'format': [('docker', 'tar.xz')] 'format': [('docker', 'tar.xz')]
'name': 'Fedora-Docker-Base', 'name': 'Fedora_Docker-Base',
'target': 'f25', 'target': 'f25',
'version': '25', 'version': '25',
'release': None, 'release': None,