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

Restyle looking at downstream #2

Merged
merged 47 commits into from
Jul 21, 2020
Merged

Restyle looking at downstream #2

merged 47 commits into from
Jul 21, 2020

Conversation

restyled-io[bot]
Copy link

@restyled-io restyled-io bot commented Jul 14, 2020

A duplicate of #1 with additional commits that automatically address
incorrect style, created by Restyled.

Since the original Pull Request was opened as a fork in a contributor's
repository, we are unable to create a Pull Request branching from it with only
the style fixes.

The following Restylers made fixes:

  • prettier-markdown

To incorporate these changes, you can either:

  1. Merge this Pull Request instead of the original, or

  2. Ask your contributor to locally incorporate these commits and push them to
    the original Pull Request

    Expand for example instructions
    ```console
    git remote add upstream https://github.com/freight-trust/docker-gen.git
    git fetch upstream pull/<this PR number>/head
    git merge --ff-only FETCH_HEAD
    git push
    ```
    

NOTE: As work continues on the original Pull Request, this process will
re-run and update (force-push) this Pull Request with updated style fixes as
necessary. If the style is fixed manually at any point (i.e. this process finds
no fixes to make), this Pull Request will be closed automatically.

Sorry if this was unexpected. To disable it, see our documentation.

jwilder and others added 30 commits November 6, 2017 11:06
MAINTAINER is deprecated, using LABEL now
ECS changed the /proc/self/cgroup paths which are used to determine
the current container ID.  This updates the regexes to search for
the docker formatted ones and ECS one separately.
…text-fix

Fixes missing assignment to id in context file conditions
- github.com/BurntSushi/toml
- github.com/docker/docker to github.com/moby/moby v19.03.8
- github.com/fsouza/go-dockerclient to v1.6.5
- github.com/docker/go-units to v0.4.0
- github.com/gorilla/mux to v1.7.4
- golang.org/x/net
Docker hub build servers are to slow it seems.
github.com/fsouza/go-dockerclient still uses the old alias.
@restyled-io restyled-io bot force-pushed the restyled/pull-1 branch from 7b86a34 to 1132736 Compare July 15, 2020 02:36
@restyled-io restyled-io bot force-pushed the restyled/pull-1 branch from 1132736 to 8bdabbb Compare July 21, 2020 13:04
@sambacha sambacha merged commit c9336d2 into master Jul 21, 2020
@sambacha sambacha deleted the restyled/pull-1 branch July 21, 2020 13:40
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.

8 participants