update oraclelinux for yum-utils

[lp117937]

[AMD64 7.5] 2018-07-31-79
[AMD64 7-slim] 2018-07-31-16
[ARM 7.5] 2018-07-31-78
[ARM 7-slim] 2018-07-31-15
[AMD64 6.10] 2018-07-30-58
[AMD64 6-slim] 2018-07-30-13

Signed-off-by: Laszlo (Laca) Peter laszlo.peter@oracle.com

[tianon]

Hi! We prefer if commits that contain tarballs are the only commit that does so in a given commit tree (since Git does not handle binary files very well, and does so even less well with large binary files like a full rootfs tarball).

It appears that the commits you've put on the dist-* branches have just added the new tarballs on top of the ones @Djelibeybi previously committed (and it's actually a bit unfortunate that it appears we missed this with some of the previous updates too on top of the tarballs that @jlbutler committed).

The simplest way to fix this is probably to do something like git rebase -i master on each branch and squash all unique commits for each dist branch down to a single commit above master.

To prevent this in the future, I'd recommend either creating a new branch based on master for each update and force-pushing on top of the old, or using git commit --amend to update the older commit (instead of creating a new one).

[jlbutler]

Dang, that's on me. Reading this, I recall that @Djelibeybi advised I force push, and it appears I completely forgot. Apologies for additional work to be done.

[lp117937]

Hi, rebased both branches in the container-images repo and updated the commit to docker-official-images.

[tianon]

❤️!

Diff:

diff --git a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz
index 0a6cd38..59e4a75 100644
Binary files a/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz and b/oraclelinux_6-slim/oraclelinux-6-slim-rootfs.tar.xz differ
diff --git a/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz b/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz
index a6ff24d..0b99490 100644
Binary files a/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz and b/oraclelinux_6/oraclelinux-6.10-rootfs.tar.xz differ
diff --git a/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz b/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz
index 672f8f6..af35f81 100644
Binary files a/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz and b/oraclelinux_7-slim/oraclelinux-7-slim-rootfs.tar.xz differ
diff --git a/oraclelinux_latest/oraclelinux-7.5-rootfs.tar.xz b/oraclelinux_latest/oraclelinux-7.5-rootfs.tar.xz
index f7ef9c9..8551c2d 100644
Binary files a/oraclelinux_latest/oraclelinux-7.5-rootfs.tar.xz and b/oraclelinux_latest/oraclelinux-7.5-rootfs.tar.xz differ

[tianon]

LGTM

Build test of #4677; ccd2180; amd64 (oraclelinux):

$ bashbrew build oraclelinux:7.5
Building bashbrew/cache:c7f6056654a721c11ae6b0e710cb7695b9f2e15e33d95bcefcc25ec891e48f0b (oraclelinux:7.5)
Tagging oraclelinux:7.5
Tagging oraclelinux:7
Tagging oraclelinux:latest

$ test/run.sh oraclelinux:7.5
testing oraclelinux:7.5
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:7-slim
Building bashbrew/cache:d880146343bdeb958aeb2e0300329e9b4e2e5cd6a041d347a2971ddc5384402a (oraclelinux:7-slim)
Tagging oraclelinux:7-slim

$ test/run.sh oraclelinux:7-slim
testing oraclelinux:7-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6.10
Building bashbrew/cache:267bd1c62d06e1d6a1222b772da2b85c91167169a608ae1199db2aa198c74d1d (oraclelinux:6.10)
Tagging oraclelinux:6.10
Tagging oraclelinux:6

$ test/run.sh oraclelinux:6.10
testing oraclelinux:6.10
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build oraclelinux:6-slim
Building bashbrew/cache:32bc3ac7d0c30dc69a516d12a5be30837d6765ebf21756dfd41856d4f233161b (oraclelinux:6-slim)
Tagging oraclelinux:6-slim

$ test/run.sh oraclelinux:6-slim
testing oraclelinux:6-slim
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed