backbeat icon indicating copy to clipboard operation
backbeat copied to clipboard
verified publisher icon scality

improvement: S3C-3776 Dockerfile for kubernetes deployment

Open jonathan-gramain opened this issue 4 years ago • 8 comments

Add a Dockerfile that will be used by eve to build images suitable for a dev kubernetes deployment

Note: no impact on branches 8.x

jonathan-gramain avatar Feb 13 '21 00:02 jonathan-gramain

Hello jonathan-gramain,

My role is to assist you with the merge of this pull request. Please type @bert-e help to get information on this process, or consult the user documentation.

Status report is not available.

bert-e avatar Feb 13 '21 00:02 bert-e

Conflict

A conflict has been raised during the creation of integration branch w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment with contents from w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment origin/development/8.1
 $ git merge origin/w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment

bert-e avatar Feb 13 '21 00:02 bert-e

History mismatch

Merge commit #f6b1730421019c3a79e3d3f87b047ffdb5f0393e on the integration branch w/7.9/improvement/S3C-3776-dockerfileForKubeDeployment is merging a branch which is neither the current branch improvement/S3C-3776-dockerfileForKubeDeployment nor the development branch development/7.9.

It is likely due to a rebase of the branch improvement/S3C-3776-dockerfileForKubeDeployment and the merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

bert-e avatar Feb 13 '21 00:02 bert-e

/reset

jonathan-gramain avatar Feb 13 '21 00:02 jonathan-gramain

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e avatar Feb 13 '21 00:02 bert-e

Conflict

A conflict has been raised during the creation of integration branch w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment with contents from w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment and development/8.1.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment origin/development/8.1
 $ git merge origin/w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment

bert-e avatar Feb 13 '21 00:02 bert-e

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • stabilization/7.9.0

Follow integration pull requests if you would like to be notified of build statuses by email.

bert-e avatar Feb 13 '21 00:02 bert-e

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

bert-e avatar Feb 13 '21 00:02 bert-e