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

Docker: Sync main Dockerfile to docker/ubuntu/Dockerfile #3205

Merged
merged 2 commits into from
Oct 19, 2023

Conversation

echoix
Copy link
Member

@echoix echoix commented Oct 14, 2023

Closes #3204

I copied over the ubuntu dockerfile edited in #3170 to the dockerfile in the root of the repo, and added a note at the top for future edits to the file (in both files).

This should allow the additional checks to pass again.

@ninsbl
Copy link
Member

ninsbl commented Oct 14, 2023

Thanks @echoix

@echoix
Copy link
Member Author

echoix commented Oct 14, 2023

Travis failing is unexpected, it didn't fail up to yesterday, and it errors out at the https://github.com/OSGeo/grass/blob/0bc5039dd372684562b13f85ae087418a1add8a4/.travis/linux.before_install.sh file

@ninsbl
Copy link
Member

ninsbl commented Oct 14, 2023

Failure of the Ubuntu minimum Test seems an unrelated, random time out of a temporal test.

1 similar comment
@ninsbl
Copy link
Member

ninsbl commented Oct 14, 2023

Failure of the Ubuntu minimum Test seems an unrelated, random time out of a temporal test.

@neteler
Copy link
Member

neteler commented Oct 15, 2023

Travis failing is unexpected, it didn't fail up to yesterday, and it errors out at the https://github.com/OSGeo/grass/blob/0bc5039dd372684562b13f85ae087418a1add8a4/.travis/linux.before_install.sh file

See #3202

@echoix
Copy link
Member Author

echoix commented Oct 16, 2023

The Pylint failure, even if I'm certain that it's not this PR that caused it, intrigues me since there are still 111 failures and 180 passed, 98 deselected, and the three other steps didn't run (compiling example module and building and deploying sphinx doc)

@neteler
Copy link
Member

neteler commented Oct 18, 2023

May we merge this PR?

@echoix
Copy link
Member Author

echoix commented Oct 18, 2023

I hoped it would be merged last weekend ;)

@neteler neteler added bug Something isn't working backport to 8.3 labels Oct 18, 2023
@neteler neteler added this to the 8.3.2 milestone Oct 18, 2023
@neteler
Copy link
Member

neteler commented Oct 18, 2023

We are trapped: "Required statuses must pass before merging".. :(

@echoix
Copy link
Member Author

echoix commented Oct 18, 2023

Do you want me to just temporarily ou the old version in this PR or a new one (which would have the additional checks failing)?

@echoix
Copy link
Member Author

echoix commented Oct 18, 2023

I pinned the version of pytest-pylint like suggested by #3203 (comment)

It should allow to pass the tests. The errors should still be fixed, they seem legitimate (by the looks of it without looking in a complete IDE). Thus I made sure to leave a note in the action in order to remove it very shortly after.

Feel free to cherry pick the first commit only for back porting, or reverting anything else later. But it unlocks everybody else for now.

@echoix echoix changed the title Copy docker/ubuntu/Dockerfile to Dockerfile, Copy docker/ubuntu/Dockerfile to Dockerfile Oct 18, 2023
@neteler neteler changed the title Copy docker/ubuntu/Dockerfile to Dockerfile CI: copy docker/ubuntu/Dockerfile to Dockerfile Oct 19, 2023
Copy link
Member

@wenzeslaus wenzeslaus left a comment

Choose a reason for hiding this comment

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

This is great. I just changed the subject since it is more about the Docker files than CI. CI is just checking the requirements here.

I'll mention the pytest-pylint hot fix in the final commit message when merging.

@wenzeslaus wenzeslaus changed the title CI: copy docker/ubuntu/Dockerfile to Dockerfile Docker: Sync main Dockerfile to docker/ubuntu/Dockerfile Oct 19, 2023
@wenzeslaus wenzeslaus merged commit 37239ca into OSGeo:main Oct 19, 2023
19 checks passed
@neteler neteler modified the milestones: 8.3.2, 8.4.0 Oct 24, 2023
landam pushed a commit to landam/grass that referenced this pull request Oct 25, 2023
- Copies over the Ubuntu Dockerfile edited in OSGeo#3170 to the main Dockerfile in the root of the repo.
- Adds a note at the top for future edits to the file (in both files).

Additionally, this includes a temporary fix for pytest-pylint where new version finds more issues than the old one, so we need to use the old one before we fix the issues.
@echoix echoix deleted the docker_sync_file branch November 3, 2023 12:19
neteler pushed a commit to nilason/grass that referenced this pull request Nov 7, 2023
- Copies over the Ubuntu Dockerfile edited in OSGeo#3170 to the main Dockerfile in the root of the repo.
- Adds a note at the top for future edits to the file (in both files).

Additionally, this includes a temporary fix for pytest-pylint where new version finds more issues than the old one, so we need to use the old one before we fix the issues.
HuidaeCho pushed a commit to HuidaeCho/grass that referenced this pull request Jan 9, 2024
- Copies over the Ubuntu Dockerfile edited in OSGeo#3170 to the main Dockerfile in the root of the repo.
- Adds a note at the top for future edits to the file (in both files).

Additionally, this includes a temporary fix for pytest-pylint where new version finds more issues than the old one, so we need to use the old one before we fix the issues.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] Failing Additional checks since Dockerfile and docker/ubuntu/Dockerfile are different
4 participants