From e671baebdb72a2911dda871929018ebc2418fc22 Mon Sep 17 00:00:00 2001 From: Giulio Calacoci Date: Wed, 23 May 2018 15:54:40 +0200 Subject: [PATCH] Add fedora28 support, remove fedora26. Signed-off-by: Giulio Calacoci --- README.md | 2 +- fedora-26-x86-64/Dockerfile | 9 --- fedora-26-x86-64/files/tmp/3B921D09.txt | 55 ------------------- fedora-26-x86-64/files/tmp/64DAB85D.txt | 32 ----------- fedora-26-x86-64/files/tmp/rpm-sign.exp | 10 ---- fedora-28-x86-64/Dockerfile | 5 ++ .../files/etc/yum.conf | 0 fedora-28-x86-64/files/tmp/9DB62FB1.txt | 30 ++++++++++ 8 files changed, 36 insertions(+), 107 deletions(-) delete mode 100644 fedora-26-x86-64/Dockerfile delete mode 100644 fedora-26-x86-64/files/tmp/3B921D09.txt delete mode 100644 fedora-26-x86-64/files/tmp/64DAB85D.txt delete mode 100755 fedora-26-x86-64/files/tmp/rpm-sign.exp create mode 100644 fedora-28-x86-64/Dockerfile rename {fedora-26-x86-64 => fedora-28-x86-64}/files/etc/yum.conf (100%) create mode 100644 fedora-28-x86-64/files/tmp/9DB62FB1.txt diff --git a/README.md b/README.md index 1d1454e..f11f6ae 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,8 @@ Use the following repositories/tags: ## Fedora -* alanfranz/docker-rpm-builder-configurations:fedora-26 * alanfranz/docker-rpm-builder-configurations:fedora-27 +* alanfranz/docker-rpm-builder-configurations:fedora-28 FAQ diff --git a/fedora-26-x86-64/Dockerfile b/fedora-26-x86-64/Dockerfile deleted file mode 100644 index 8298b7a..0000000 --- a/fedora-26-x86-64/Dockerfile +++ /dev/null @@ -1,9 +0,0 @@ -FROM fedora:26 -MAINTAINER Alan Franzoni username@franzoni.eu -ADD files/etc/yum.conf /etc/ -ADD files/tmp /tmp -RUN rpm --import /tmp/*.txt -RUN touch /var/lib/rpm/* ; dnf -y upgrade -RUN touch /var/lib/rpm/* ; dnf -y install @"Minimal Install" @buildsys-build yum-utils rpm-sign gnupg expect -RUN touch /var/lib/rpm/* ; dnf -y install spawn -RUN mv /tmp/rpm-sign.exp /usr/local/bin/rpm-sign.exp diff --git a/fedora-26-x86-64/files/tmp/3B921D09.txt b/fedora-26-x86-64/files/tmp/3B921D09.txt deleted file mode 100644 index 5bf962f..0000000 --- a/fedora-26-x86-64/files/tmp/3B921D09.txt +++ /dev/null @@ -1,55 +0,0 @@ -pub 4096R/3B921D09 2016-08-08 Fedora 26 Secondary (26) -sub 2048g/5F6EB130 2016-08-08 - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFeocJYBEAD0YKTqzt0QVgmHkRO0G8HpwdsNEzPANkDWe4KC1YnKTDjl4ojv -BfGc4bzLb+jXM4364DWGxArW6QJFW0DWI9DsK8+5TO+Zi9xtLi5BXKImw2cYh7HK -bCdNtBxT3xI1UVUuAkL8qbschWTUKgLYC1ywwjiFmjY7fEUpr3jzQrhYxazqN0Nv -R/lq9k3VAetXTRfOEOhUrIhrTRQnsK58rspF4nWqZTj6D8jkSGcQqs9D3/btbsx6 -9QkFKIIfxvfZxIHccaYfJhjgNU75b4Zl6NQvRm0jB8jpFqMTvG7zvwubRiCku0YS -T+jy5RiZyaL5Yue0RP8dW0xfsVdRE7zsNaTRuvwVOBfXIFuGj81q0JrO7G5HW2Km -o2byOeqidPyrlFtJv1PfByUFKIZ530HM4mnVH8193ZbravjJCpj1Ye07cq0yy0Nt -2rvEpi63EYCBOaOQ9SJaYf77SZlZj/r7W2Hnnn40RqfzRUS3EAIucx1KtqNly5B4 -zm56J8I9rPmqf/zfj+0/kGj8YRm8MP2+F7Se836PGF5d3zjazamcf0ORQmG67dwq -ddB+a5JhAxWl8OlFNsNBdRnu4qY3i6jK8jhI4U6NwQYEcWmnEeK5rbU20lEKPKla -+1bK5OlU02JINuS0iXyCMEYyLdheCRQVGXGADVgXy790nTb/IpGVmDj7lQARAQAB -tEBGZWRvcmEgMjYgU2Vjb25kYXJ5ICgyNikgPGZlZG9yYS0yNi1zZWNvbmRhcnlA -ZmVkb3JhcHJvamVjdC5vcmc+iQI4BBMBAgAiBQJXqHCWAhsPBgsJCAcDAgYVCAIJ -CgsEFgIDAQIeAQIXgAAKCRBFYP1NO5IdCWGXD/wOG5fluN233GHQsZ1WQneDaq/z -i/GyyNelbR5TVJhmZ/ifi51EGx4/w6ZdWokmVQ6UejatdeQCQhlFlF1g9Ax/oYoE -bdJVmFRP7HzXqWcENXnCSXcpha3C1N8g12a1B3qew0gbuRbhwnnzcDUQSSrcefS1 -XpnhRmDUt7WanbWOWQ6kktYdAkfVd2/k/Y5nHUZp25mnjsNPbsffev6xTdUB4dVk -irBR4quMYwDXzzKKLz5E7pZB94C8WUCAYPOKM5pCuJR3L4pAjHGjUyrSSxAaCepf -iwJcCOQHMJY7CpuRqmhc1o3BaV8nO1HWMzbI78RChYshKCDY38Czh6SoeMJzaKUD -Asvz7tNhOl816s0dbtVw43Ngou7G7tOxmnI47AMNHBuBbA/qKRg6et96lWcjmJiS -1xks4FZFSEoA9BzH2G9o5LgYKKTRZIRPVZ61nsKa+as4E5oyDbXnUmnbanrfUvAL -L+vOYTEeFCB7qif2Ek58ujIQBLczmU+2S74pdQlu7kSYnrqNkkRxFOgFWt5udiOw -5R2vnUO2VAISDlUnkgyHp2SUnHAE2Q4StccvR9JeZUH9IuVioN/nAwzYTTKyOiZX -zipkxwznSjukiS4WPqdnLrTCNQ7WPpyygQDS/Z1DLt/+Rdxz4wkX76JjNVL+8hBF -07H2vzBvtkCoZXEQ17kCDQRXqHCWEAgA6UwG6HiPE0EY3UpaAJDQSibtS5zaId0H -8SXhdAk3ZVtzbskmI8FVuAyi6+Phl9Ps2RjVR88p9Uk6dV2QnRp8DpXQFeGfjMkf -okl5TmnGu5txXWMGdGeiAs/VlMzRuUZI05fJR6eeA8gn4wpBPmuXBgFre/3tuMxu -ahBLIhrLuThMMKZrfV42zaYN9waddnN+upM96aKQziNbmU7CSVGXK1wKtvbSF51B -XeO7w7KdTspKedjVLMhWrlUEAKmdeZDj+9slw4QXpqWMP8vmmIxbrYXm94r6IgYF -KYk1eZ2t8JbNdjFfRKGLKsPI2W9uH8+fI9/Xqw+mSwFMGqruBpmxZwADBQf/R2o8 -TOghFlNt90wrfP0XaumUP+aZLvb6ndjESTS7PaX1R1wsHtPaVDWnaTgfA66rrCp/ -66vmKf6uHlPeUx0RREaIJ56uKP3n0x8HDn1ZBba83NoriWdVqar6f3+UBoZ0u1GB -K/F8vG70Xj3x0dJ2psFP62yrDg5z+/TCM+o7EnUl5KYOpa3R25W6UEHoEexUIqxZ -p9+4FGH7+aO2LKbslEL3AVgraUBiFknJl7ikH3ZxljiFVigjBq/JN2F5CrmeAhdA -ZedF3lE/epQ+LSQ+TTN7ukGt2l37aJDTRGNHqe6KCy9KqIBr8XAaz9mJ34QF4hB/ -tDUSGQP5eg93ecG5PokCHwQYAQIACQUCV6hwlgIbDAAKCRBFYP1NO5IdCQHSEAC4 -g0BMaQu5qzLHeh/bFXtxT4vFucXLAenyLH+oIEo43crSUpjQiXzBitUc9sWMX7/m -jj8EWOGbIQNYZO712Ei7fPO7u/auZ7qIlVUKlEHZ+du1ORC5+khKrimgjP/ZIhTY -KHiIJD3BLs2rEGXdx3TQCYRIgRm066KKZ2gQy3YHngqipmOzvz9j4ctpmD6NabgX -3eWjUCzxofd3m67c6sQVKxUNQzujCgtaLIClYQEMO0E7Xq9auq9LOvD+40dLE63j -fYKSIvsQ+3qUmT0CEfk5K3GDYC30xQU4cvqCybOreSTQR0L/f/wUbTYt7Iyj/8eZ -wfi9wh2zVY2MOoe2zT6XIW2oKJFD9ka7IZsezMR4PBhEGCg69uWbPXbwIP3har1p -zIrwR1Uto9qCosupnkz3+ILQOiGxY5vtKXUr/0ulQ3gjZiLNL12m5MvnAUg4aoms -0W76wYUQG/NnccBzKE9hUAlgSak8n0gZPSRbG0wjOIcbE/arSpQ2k8WkwxkcUuHf -OnBq/2ME1njWkNp+h+F/ifZcwcBiRNZ+S8Y/kV2kh36pjkic4mCc4JjoNLxMic3J -pbf15Q8X0mgDbp1RVPtm4QTagq3kXRGjFpVaUfJF6ZdzPBm5qJ6F7ZX9p/av2zCp -Aw7ZjY7u8pfCZttaiaHYd6KYgPX5LEQK5QSTxy/JNA== -=P9ev ------END PGP PUBLIC KEY BLOCK----- diff --git a/fedora-26-x86-64/files/tmp/64DAB85D.txt b/fedora-26-x86-64/files/tmp/64DAB85D.txt deleted file mode 100644 index 852e892..0000000 --- a/fedora-26-x86-64/files/tmp/64DAB85D.txt +++ /dev/null @@ -1,32 +0,0 @@ -pub 4096R/64DAB85D 2016-09-09 Fedora 26 Primary (26) - ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQINBFfTPiIBEACnRl8tUymlDOBNJWjtICofXNyM4qt2qfGTme3YZ0ZVOay55pK6 -1OLiyNLXyJfDH9d2U6dZn5UYLNdE3QXRVua5GXlSituY0+pzs7n9doW/U8kdhm9a -zOfyR1Wh/u/FHUmiXUvuwLVzqee7lSU3Ry1voDzPIyM/3/eXDa4wAkbYuestYV2F -G2VqcMgDIEudYlkz6N1OigMWvkvYXFHVC1A55ydHenWffQzQaPpGuJLA61ARZ5Cu -X46xgOCPc+aSvAm/D0cmOS7xhZcUqs1A5uGtViZqsRt59Bp0HVNxftfBCO/rQx+9 -FrV1vYXkbTdzG3unlVCJxxC2dW2W6hb3SNgPbE5fgiG9twvVU+3GsFUwARclRWiZ -HjbWdjlRTkRySzkkdnXalJo3G4UAEDfkvujM2dB4Dt6gVkCPvSKVpK6HTtBdHmDO -scYfazX/j86somO9npHSrb11tYaLbx2PYfEvw6F7rsxr78/GBjzPnKkK3suXxDlS -8q7tT1FYV89EzjME5+ThJOyPxyXHKQQwozIXcB/BUfyWGlfFFh8baD+DA8lNgQvl -/TVFvW6bUV6ll5JoVJJhC87EACL7mlo6AQtwCivUEPxusVXM6u53UKbsc4gVdkZd -WpUyT2YsgKK05/eVDIkMLHXb3efVbJ6NCj88Fq6hYB7+Y5MRbRFJpvS4DQARAQAB -tDxGZWRvcmEgMjYgUHJpbWFyeSAoMjYpIDxmZWRvcmEtMjYtcHJpbWFyeUBmZWRv -cmFwcm9qZWN0Lm9yZz6JAjgEEwECACIFAlfTPiICGw8GCwkIBwMCBhUIAgkKCwQW -AgMBAh4BAheAAAoJEIEqa0tk2rhdFk8P/1WZFEEBfUr9ywRxeVAwiKx9Ggzf8m61 -p98spnUGj8N53bKwguKnMqAUtm9/XQPRGYRfqKKuKF/4AySCOmqFP86zHThnbFcb -fMyiJOxBN5N/5dhUxTkZG1M51vFPQx53dnea3w7ypJekTwfEna46PKUD7dTV3HJg -d2YOojD9mxup0iAmi7/3mi0cHwTCZS9FF/A4eBWjuEd4OM3KzPF7HBdY37a1IBLR -k7wruMEGSq6EXcoeqG2sMmU7RnEeQxy3WqMYdRdzUjbfBN7mCAcuv2yKB1FFW4/v -PhP7ObpCCLiaL46APdGFHZ30EC4oaeqSygJ8+zAIFK40t/a0iNNf8ZKKeeuasinr -qNJAep/WoVjIpx/LlF9vw522fhYXJ75LYLBCQNke/4rQ1Rl29io2Dg29aPrEwFPj -+7zDztdvaGmu5wLPvsC+w5pyqOT2LPC19y3D7T+KfXp0gEwyZedviDwZdIXz1PX1 -IMytlwRXlrhkp/2WzJvAkJCmRSb8QsxY9Y2A4rfqrNCk6kgjc+3pXNdxumaXEp33 -pjm+z61Qrg2XXFHUhQyRiBnEtyo2Hj3tJQdrPxwGIgtKFZCv+oAwewnMw9TFycI6 -rYEfS4wdAIOGoSF/PL9Eq2xoUJQw8QFCrURm7sfS0/VmvXoSjqzZLeWI4e+JvId0 -QFFBR5ZKOqzo -=DGPs ------END PGP PUBLIC KEY BLOCK----- diff --git a/fedora-26-x86-64/files/tmp/rpm-sign.exp b/fedora-26-x86-64/files/tmp/rpm-sign.exp deleted file mode 100755 index 409fe84..0000000 --- a/fedora-26-x86-64/files/tmp/rpm-sign.exp +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/expect -f - -### rpm-sign.exp -- Sign RPMs by sending the passphrase. - -spawn rpm --addsign {*}$argv -expect -exact "Enter pass phrase: " -send -- "Secret passphrase\r" -expect eof - -## end of rpm-sign.exp diff --git a/fedora-28-x86-64/Dockerfile b/fedora-28-x86-64/Dockerfile new file mode 100644 index 0000000..4dcf24d --- /dev/null +++ b/fedora-28-x86-64/Dockerfile @@ -0,0 +1,5 @@ +FROM fedora:28 +MAINTAINER Alan Franzoni username@franzoni.eu +ADD files/etc/yum.conf /etc/ +ADD files/tmp /tmp +RUN touch /var/lib/rpm/* ; rpm --import /tmp/*.txt ; dnf -y upgrade ; dnf -y install @"Minimal Install" @buildsys-build yum-utils rpm-sign gnupg ; dnf clean all diff --git a/fedora-26-x86-64/files/etc/yum.conf b/fedora-28-x86-64/files/etc/yum.conf similarity index 100% rename from fedora-26-x86-64/files/etc/yum.conf rename to fedora-28-x86-64/files/etc/yum.conf diff --git a/fedora-28-x86-64/files/tmp/9DB62FB1.txt b/fedora-28-x86-64/files/tmp/9DB62FB1.txt new file mode 100644 index 0000000..e049f14 --- /dev/null +++ b/fedora-28-x86-64/files/tmp/9DB62FB1.txt @@ -0,0 +1,30 @@ +pub 4096R/9DB62FB1 2017-08-14 Fedora 28 (28) + +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBFmSAVYBEADakUeJgNnAP2CE3vw+iI0Um9XvuBP6NdESRiJIEPgXhKWM058J +PZDkpRETS4pbB3xUyPLoogoO76lheBEOPEAGp5mb/7vEcwlYqjtuetFi9hcsbNPx +DeOLQ9KR7Xs2idU+DlCJW1WyU9UiLoyZpQgAqF7Y50MoxPKJtfDuM52YkulYLU+M +leRtxJzHYcXArU3x3Czz1FnemVtol3/1/BvmGQPIyj2HdG4vxWbiX79AUSlchh+M +bNqOOpVVK16lLEbJCxCbPdCsKCTOI+FsdQsB4bnX5ddNcvxxACwHNUifVD/1XH8A +x77DHohRbccRtIZqZEIKecHxVyFdr2mAl9mEXSzaFvRzWa+5seCgGoV0INBhj6NE +tHhSxBYzLmr5noQ8JNPa6eRipPvYTle2vstq2YUJ8D0ZbKbxaCPstemCQZrQKzh0 +tgezIgVXKc2U0i3ZOEYf4ISMHeBnH36nRMBnaH/HkLyZyHXNE4vswJpwPjNtaofz +QDD+TmCe2ObKei8iUqfLo/8Je8IvnodS9C5l0fyEaMmo5BWc+SYRSTR9libNruwu +4j6Kuoxge9SbRuD2S0qzKK2LYRZrlkxjP8REnpvXxUfeSvNYHrbjzYDv677S6pqW +dNqyoPduKiZWy6Vg4g+pYmk5T7vrpNizGK6exKiYZ5tAUaO3lrdpHOolUwARAQAB +tCxGZWRvcmEgMjggKDI4KSA8ZmVkb3JhLTI4QGZlZG9yYXByb2plY3Qub3JnPokC +OAQTAQIAIgUCWZIBVgIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ4I5+ +Yp22L7GMDhAAwwQhpXFXxegkgi0pFbA98Om3UBiQtcDemQSls0HEJh+J9sm4g0Sj +2K7khFnJCKsQNVnJDVxvxJ9j/AFZErRMjudUF7ACZfKDtNxq3gkH7qICPKk/DzeX +blrzPc/RX+kkl9I5jFBhapypsExa2yilfk8IiKq6nd2Ro7K+gEh/CMhfe7YBGInZ +3FmZWsq1+WKTZCUNmA8++eWIbmukrAoieTHTvIcOmc+dfaUAmjWtOnc69E9UmTCw +EMEbPVMSmZv0qnp0kByWUeV5cZR7NoXmaMaTr5aUY6wJuLshbWzgmudorf1udUwq +YlpxZJtQCxlHezulrDJG19d4dC5vGdYbnpeq01s9L9yieccKafWfldBU+YBZbo9e +9Uzu/766pxEAtqYYSyZboiqsj5NCoq2fRc4DjfCDVEaK7HSPcQpQFA+p18sD2qcc +EPPo+F2+M8PZLf4khipGRH1nm9AmM/v25a/9w22bDuUUvpcWwW45YsNToTTM4d6T +s750lCw/4K3jHnrQWxL7VfwLw0H1xlxnVqIXlL3HeOIn9EoaygxV2gJtPjB/Gwr2 +z/K+HoibAxvo7VcpxD+N38LaPtrx/ERMxeYBJvMgSqGaC3MXj36/qv0zTyyTItYX +9JfbOrikoJa+aKQGmTWLrcuKaYl6Jzsq3vRTbNRRi4SpXwTwMyuW4pU= +=fo1W +-----END PGP PUBLIC KEY BLOCK-----