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

Removed deprecated instruction MAINTAINER #8846

Merged

Conversation

OlegChuev
Copy link
Contributor

Description

This PR...

Removes deprecated MAINTAINER instruction from all Dockerfiles and uses LABEL instead
https://docs.docker.com/reference/dockerfile/#maintainer-deprecated

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)
  • build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Copy link

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

@OlegChuev
Copy link
Contributor Author

Not sure which version or branch I should target to resolve conflicts :/

@weizhouapache weizhouapache changed the base branch from 4.19 to 4.18 March 29, 2024 10:53
@DaanHoogland
Copy link
Contributor

@OlegChuev ,Did you test this? can you add test description(s)?

Copy link

codecov bot commented Mar 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 13.16%. Comparing base (8c62365) to head (2e30714).

Additional details and impacted files
@@            Coverage Diff            @@
##               4.18    #8846   +/-   ##
=========================================
  Coverage     13.16%   13.16%           
  Complexity     9203     9203           
=========================================
  Files          2724     2724           
  Lines        258153   258153           
  Branches      40236    40236           
=========================================
  Hits          33982    33982           
  Misses       219866   219866           
  Partials       4305     4305           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@OlegChuev
Copy link
Contributor Author

@OlegChuev ,Did you test this? can you add test description(s)?

Tested only tools/docker/Dockerfile, but I believe it should be OK since there're only changes in LABEL instruction

I manually build container with docker buildx build -f tools/docker/Dockerfile -t cloudstack/simulator:4.18.X.0 --platform linux/arm64 .

And as a result I got cloudstack/simulator:4.18.X.0 image with the following information in image metadata:

 › docker image inspect cloudstack/simulator:4.18.X.0
[
    {
        "Id": "sha256:176b6bb5080fb20f25d3e507fb7622f0ef1ada6c672cb0d3760fb7fdd4494755",
        "RepoTags": [
            "cloudstack/simulator:4.18.X.0"
        ],
        "RepoDigests": [],
        "Parent": "",
        "Comment": "buildkit.dockerfile.v0",
        "Created": "2024-04-01T12:14:12.237046882Z",
        "Container": "",
        "ContainerConfig": {
            "Hostname": "",
            "Domainname": "",
            "User": "",
            "AttachStdin": false,
            "AttachStdout": false,
            "AttachStderr": false,
            "Tty": false,
            "OpenStdin": false,
            "StdinOnce": false,
            "Env": null,
            "Cmd": null,
            "Image": "",
            "Volumes": null,
            "WorkingDir": "",
            "Entrypoint": null,
            "OnBuild": null,
            "Labels": null
        },
        "DockerVersion": "",
        "Author": "",
        "Config": {
            "Hostname": "",
            "Domainname": "",
            "User": "",
            "AttachStdin": false,
            "AttachStdout": false,
            "AttachStderr": false,
            "ExposedPorts": {
                "5050/tcp": {},
                "8080/tcp": {},
                "8096/tcp": {}
            },
            "Tty": false,
            "OpenStdin": false,
            "StdinOnce": false,
            "Env": [
                "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
            ],
            "Cmd": [
                "/usr/bin/supervisord"
            ],
            "ArgsEscaped": true,
            "Image": "",
            "Volumes": {
                "/var/lib/mysql": {}
            },
            "WorkingDir": "/root",
            "Entrypoint": null,
            "OnBuild": null,
            "Labels": {
                "Author": "Apache CloudStack <dev@cloudstack.apache.org>",
                "License": "ApacheV2",
                "Vendor": "Apache.org",
                "Version": "4.18.1.0",
                "org.opencontainers.image.ref.name": "ubuntu",
                "org.opencontainers.image.version": "22.04"
            }
        },
        "Architecture": "arm64",
        "Os": "linux",
        "Size": 1711037341,
        "GraphDriver": {
            "Data": {
                "LowerDir": "/var/lib/docker/overlay2/mnv9kxp2htic0we90nnoatc4h/diff:/var/lib/docker/overlay2/4mbscd8jd3moee7cah0aud9zr/diff:/var/lib/docker/overlay2/pv944s0j3us6m2zouv41h294h/diff:/var/lib/docker/overlay2/ku313uwqmflr2xrj9mx29lqsn/diff:/var/lib/docker/overlay2/iabin3w7bw0oxc3qihtlnfom3/diff:/var/lib/docker/overlay2/338764ee9608e6de265778f10d9e8d2e7caab468151ce7fbde88864c553a303d/diff",
                "MergedDir": "/var/lib/docker/overlay2/u4hhtllaebotsyzydnes918e4/merged",
                "UpperDir": "/var/lib/docker/overlay2/u4hhtllaebotsyzydnes918e4/diff",
                "WorkDir": "/var/lib/docker/overlay2/u4hhtllaebotsyzydnes918e4/work"
            },
            "Name": "overlay2"
        },
        "RootFS": {
            "Type": "layers",
            "Layers": [
                "sha256:a510ae0f066c65d73f523d5821fe048a6858e53360ecb8d39b7b931162f11479",
                "sha256:6e015d01dff4e9d0bab341006b29b80859a30ca173c1213caa72081d4931c8c4",
                "sha256:9c89726988b69e5bd777517ab28ec9cab81e7b5e0f11623929ec9691306964a8",
                "sha256:8a3b8ae7f74e2a204bef0e9a0ce366ac2103c5d3c65398cb0f2c86929ff41b84",
                "sha256:5df74e25c08ec82cecb4631593de346d4388d9c8a149fb0dac4b69bff1dd8dfe",
                "sha256:d3b168531e0d6a92d0bc4bfafec9edc570c54faaafd0f05e8b54161ed186b0d1",
                "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
            ]
        },
        "Metadata": {
            "LastTagTime": "2024-04-01T12:14:12.935076632Z"
        }
    }
]

Copy link

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

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

changes lgtm

@sureshanaparti sureshanaparti added this to the 4.19.2.0 milestone Jun 27, 2024
Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

lgtm

tested a docker image

# docker inspect cloudstack-simulator | jq -r '.[0].Config.Labels'
{
  "Author": "Apache CloudStack <dev@cloudstack.apache.org>",
  "License": "ApacheV2",
  "Vendor": "Apache.org",
  "Version": "4.18.3.0-SNAPSHOT",
  "org.opencontainers.image.ref.name": "ubuntu",
  "org.opencontainers.image.version": "22.04"
}

@DaanHoogland DaanHoogland merged commit 727b3b0 into apache:4.18 Sep 20, 2024
22 of 25 checks passed
@OlegChuev OlegChuev deleted the fix/updated-maintainer-instruction branch September 20, 2024 08:55
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.

5 participants