Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated images for CVE-2015-4000 (MGASA-2015-0246) #840

Merged
merged 9 commits into from
Jul 2, 2015
Merged

Updated images for CVE-2015-4000 (MGASA-2015-0246) #840

merged 9 commits into from
Jul 2, 2015

Conversation

juanluisbaptiste
Copy link
Contributor

Updated for CVE-2015-4000

@juanluisbaptiste juanluisbaptiste mentioned this pull request Jun 22, 2015
11 tasks
@tianon
Copy link
Member

tianon commented Jun 24, 2015

I see that the commits referenced here did exist at one point (juanluisbaptiste/docker-brew-mageia@9dde5fc and juanluisbaptiste/docker-brew-mageia@5adb71a), but no branches reference them now, so that's why Travis is failing and why this will fail to build. I think getting both of those tarballs into that top commit of the "dist" branch there on your repo should be correct, right?

@juanluisbaptiste
Copy link
Contributor Author

Dammit... I don't know what I did while also preparing the mga 5 image I think I deleted these.

@juanluisbaptiste
Copy link
Contributor Author

@tianon I don't know what I'm doing wrong, this is what I did, according to the instructions you once gave me when initially importing these images:

git branch -D dist
git checkout -b dist
create images
git add .
git commit
git push
Edit my stackbrew fork with the new commit id
git add
git commit
git push -f
Then I went to my stackbrew fork and clicked on pull request.

@juanluisbaptiste
Copy link
Contributor Author

@tianon can you give me some help ? I really don't know what I'm doing wrong here.

latest: git://github.com/juanluisbaptiste/docker-brew-mageia@ed9534c591e9b03593e8111990395f77bbd256c0 4
cauldron: git://github.com/juanluisbaptiste/docker-brew-mageia@ed9534c591e9b03593e8111990395f77bbd256c0 cauldron
4: git://github.com/juanluisbaptiste/docker-brew-mageia@ed9534c591e9b03593e8111990395f77bbd256c0 4
latest: git://github.com/juanluisbaptiste/docker-brew-mageia@a814b1bd92e4bd4967ca17c56cd873df67ac4d91 4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your repo looks correct now, but I think Travis is failing on the extra blank space at the end of this line.

Also, shouldn't you be adding 5 in here somewhere? (and should it be the new "latest"?)

@juanluisbaptiste
Copy link
Contributor Author

@tianon thanks, about mageia 5, I was going to do it in a separate pull request, to not mix topics, or should I add that commit to this PR ?

@tianon
Copy link
Member

tianon commented Jun 30, 2015

I certainly don't have a problem with adding it here! 👍

@juanluisbaptiste
Copy link
Contributor Author

Ok, added !

@tianon
Copy link
Member

tianon commented Jul 1, 2015

This is failing to build, but I think it's because all the commit references should be a814b1bd92e4bd4967ca17c56cd873df67ac4d91 (since the one you put in the file here is the one where you added the Dockerfile, but the rootfs tarball doesn't exist there).

@juanluisbaptiste
Copy link
Contributor Author

@tianon Fixed.

@tianon
Copy link
Member

tianon commented Jul 2, 2015

👍 LGTM

Build test of #840; 4cd89cf (mageia):

$ url="https://raw.githubusercontent.com/docker-library/official-images/4cd89cffc8ce3deb0e6c68902b75d204fb5be153/library/mageia"
$ bashbrew build "$url"
Processing mageia:latest ...
Processing mageia:cauldron ...
Processing mageia:4 ...
Processing mageia:5 ...
$ bashbrew list --uniq "$url" | xargs test/run.sh
testing mageia:latest
    'utc' [1/3]...passed
    'cve-2014--shellshock' [2/3]...passed
    'no-hard-coded-passwords' [3/3]...passed
testing mageia:cauldron
    'utc' [1/3]...passed
    'cve-2014--shellshock' [2/3]...passed
    'no-hard-coded-passwords' [3/3]...passed
testing mageia:4
    'utc' [1/3]...passed
    'cve-2014--shellshock' [2/3]...passed
    'no-hard-coded-passwords' [3/3]...passed

@yosifkit
Copy link
Member

yosifkit commented Jul 2, 2015

LGTM

yosifkit added a commit that referenced this pull request Jul 2, 2015
@yosifkit yosifkit merged commit cd3e8f5 into docker-library:master Jul 2, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants