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

Custom kitchen-docker gem to correctly remove Docker images #631

Merged
merged 3 commits into from
Mar 30, 2020

Conversation

rshad
Copy link
Contributor

@rshad rshad commented Mar 27, 2020

Hi all!

This PR resolves #628.

Kr,

Rshad

@rshad rshad self-assigned this Mar 27, 2020
@rshad rshad added this to the Sprint - 108 - DevOps milestone Mar 27, 2020
@rshad rshad requested review from jm404, manuasir, xr09 and Zenidd March 27, 2020 17:46
cd $HOME/wazuh-qa && \
git fetch --all && \
git checkout devel && \
git pull origin devel
Copy link
Contributor

Choose a reason for hiding this comment

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

No need to use pull after fetch --all.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @manuasir,

I removed git fetch --all so the task to run, now is

RUN cd $HOME && \
    git clone https://github.com/wazuh/wazuh-qa.git && \
    cd $HOME/wazuh-qa && \
    git checkout devel && \
    git pull origin devel

I think pull is needed so it combines the fetch of remote changes and merge them in local, in one command.

Done in 20aa885.

Kr,

Rshad

@rshad rshad requested a review from manuasir March 30, 2020 11:10
Copy link
Contributor

@jm404 jm404 left a comment

Choose a reason for hiding this comment

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

LGTM!

@jm404 jm404 merged commit b146910 into devel Mar 30, 2020
@BraulioV BraulioV deleted the feature-628-custom-kitchen-docker branch January 28, 2021 08:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants