Skip to content
This repository has been archived by the owner on Feb 9, 2022. It is now read-only.

add mixer_debug docker image target #277

Merged
merged 6 commits into from
Feb 24, 2017
Merged

Conversation

ayj
Copy link
Contributor

@ayj ayj commented Feb 23, 2017

Add a mixer docker image using the debug_base image (similar to manager). This is in preparation for #276 which will eventually auto-build docker images with consistent tags on merge into master via Jenkins.


This change is Reviewable

Copy link
Contributor

@douglas-reid douglas-reid left a comment

Choose a reason for hiding this comment

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

Seems reasonable to me.

We probably should add some comment to the docker build rules about keeping the two sets of arguments and ports in sync moving forward to avoid drift between debug and other.

@codecov-io
Copy link

codecov-io commented Feb 23, 2017

Codecov Report

Merging #277 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #277   +/-   ##
=======================================
  Coverage   83.83%   83.83%           
=======================================
  Files          50       50           
  Lines        2827     2827           
=======================================
  Hits         2370     2370           
  Misses        431      431           
  Partials       26       26
Impacted Files Coverage Δ
pkg/config/manager.go 97.22% <ø> (-2.78%)
pkg/adapterManager/parallelManager.go 95.23% <ø> (ø)
adapter/prometheus/server.go 89.47% <ø> (+10.52%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 60868b3...2b7cdb6. Read the comment docs.

@ayj
Copy link
Contributor Author

ayj commented Feb 24, 2017

@douglas-reid, re: keeping two sets in sync, one option is to define a bazel macro to generate images for each base type, e.g.

def mixer_docker_build(name, **kwargs):
    bases = [
        { "suffix": "", "image": "@docker_ubuntu//:xenial", },
        { "suffix": "_debug", "image": "@ubuntu_xenial_debug//file", }
    ]
    for base in bases:
        docker_build(
            name = name+base["suffix"],
            base = base["image"],
            **kwargs
        )
mixer_docker_build(
    name = "mixer",
    entrypoint = [
        "/usr/local/bin/mixs",
        "server",
        "--globalConfigFile=/etc/opt/mixer/globalconfig.yml",
        "--serviceConfigFile=/etc/opt/mixer/serviceconfig.yml",
        "--logtostderr",
        "--v=2",
    ],
    ports = ["9091"],
    repository = "istio",
    tags = ["manual"],
    tars = [
        ":mixer_tar",
        "//testdata:configs_tar",
    ],
)

@douglas-reid
Copy link
Contributor

I like the macro approach, if others are OK with it.

Copy link
Contributor

@douglas-reid douglas-reid left a comment

Choose a reason for hiding this comment

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

Feel free to update with / without the macro approach. We can address that in a subsequent CL.

@ayj
Copy link
Contributor Author

ayj commented Feb 24, 2017

Updated to use the macro approach - PTAL. Also, I don't have write access to istio.io/mixer. Someone else will need to merge (or grant me access).

@ayj ayj merged commit 33a20bb into istio:master Feb 24, 2017
@ayj ayj deleted the add-debug-docker-image branch February 24, 2017 19:03
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants