| |
@@ -32,14 +32,15 @@
|
| |
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
|
| |
|
| |
# Equivalent of %include fedora-repo.ks
|
| |
- ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/25/ --ref=fedora-atomic/25/x86_64/docker-host
|
| |
+ ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/ --ref=fedora-atomic/25/x86_64/updates/docker-host
|
| |
|
| |
reboot
|
| |
|
| |
%post --erroronfail
|
| |
- # See https://github.com/projectatomic/rpm-ostree/issues/42
|
| |
- ostree remote delete fedora-atomic
|
| |
- ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/'
|
| |
+ # Set the ref we are tracking to the be fedora-atomic/25/x86_64/docker-host
|
| |
+ # one, which is what we are using for the two week releases. We want consumers
|
| |
+ # of this image to track the two week releases
|
| |
+ ostree admin set-origin --index 0 fedora-atomic https://dl.fedoraproject.org/pub/fedora/linux/atomic/25/ fedora-atomic/25/x86_64/docker-host
|
| |
|
| |
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
| |
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
| |
dustymabe
commented 7 years ago
This PR has two changes:
1 - use only one URL for the ostree repo when building an image
2 - build the image from the updates ostree ref but update it to track the two week ref in %post