Skip to content

Commit

Permalink
Bump fedora version from 28 to 30
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel J Walsh <[email protected]>
  • Loading branch information
rhatdan committed Sep 5, 2019
1 parent cc80ccc commit 59d3331
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .papr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ branches:
- try

host:
distro: fedora/28/atomic
distro: fedora/30/atomic

required: true

Expand Down Expand Up @@ -49,12 +49,12 @@ tests:
- podman run --net=host --security-opt label=disable --cap-add all --security-opt seccomp=unconfined -v /etc/yum.repos.d:/etc/yum.repos.d.host:ro
-v $PWD:/go/src/github.com/containers/buildah
--workdir /go/src/github.com/containers/buildah
registry.fedoraproject.org/fedora:28 bash -c sh ./.papr.sh
registry.fedoraproject.org/fedora:30 bash -c sh ./.papr.sh

---

container:
image: registry.fedoraproject.org/fedora:28
image: registry.fedoraproject.org/fedora:30

packages:
- btrfs-progs-devel
Expand Down
6 changes: 3 additions & 3 deletions demos/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ There are several variables you will want to set that are listed at the top of t
demoimg=myshdemo
quayuser=UserNameHere
myname=YourNameHere
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum

## Buildah and Docker compatibility demo
Expand All @@ -47,7 +47,7 @@ There are several variables you will want to set that are listed at the top of t
quayuser=UsernameHere
myname=YourNameHear
distro=fedora
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum

## Buildah build using Docker demo
Expand All @@ -62,5 +62,5 @@ There are several variables you will want to set that are listed at the top of t
quayuser=UsernameHere
myname=YourNameHear
distro=fedora
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum
4 changes: 2 additions & 2 deletions demos/buildah-bud-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ demoimg=buildahbuddemo
quayuser=ipbabble
myname="William Henry"
distro=fedora
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum

#Setting up some colors for helping read the demo output
Expand Down Expand Up @@ -82,4 +82,4 @@ docker rm $dockercontainer
docker rmi $demoimg
read -p "${cyan}Stop Docker${reset}"
systemctl stop docker
echo -e "${red}We are done!${reset}"
echo -e "${red}We are done!${reset}"
2 changes: 1 addition & 1 deletion demos/buildah-scratch-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
demoimg=myshdemo
quayuser=ipbabble
myname=WilliamHenry
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum

#Setting up some colors for helping read the demo output
Expand Down
2 changes: 1 addition & 1 deletion demos/buildah_multi_stage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
demoimg=mymultidemo
quayuser=myquauuser
myname=MyName
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum

#Setting up some colors for helping read the demo output
Expand Down
4 changes: 2 additions & 2 deletions demos/docker-compatibility-demo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ demoimg=dockercompatibilitydemo
quayuser=ipbabble
myname="William Henry"
distro=fedora
distrorelease=28
distrorelease=30
pkgmgr=dnf # switch to yum if using yum

#Setting up some colors for helping read the demo output
Expand Down Expand Up @@ -80,4 +80,4 @@ docker rm $dockercontainer
docker rmi $demoimg
read -p "${cyan}Stop Docker${reset}"
systemctl stop docker
echo -e "${red}We are done!${reset}"
echo -e "${red}We are done!${reset}"

0 comments on commit 59d3331

Please sign in to comment.