Skip to content

Removed build containers from docker-compose.yml in favour of separate commands#959

Merged
Silic0nS0ldier merged 5 commits intodevelopfrom
feature-docker-refinements
May 26, 2019
Merged

Removed build containers from docker-compose.yml in favour of separate commands#959
Silic0nS0ldier merged 5 commits intodevelopfrom
feature-docker-refinements

Conversation

@Silic0nS0ldier
Copy link
Copy Markdown
Member

I've been waiting to get this together for awhile now, but just needed to work out the kinks.

I've removed some redundancies in the documented installation process for Docker, and removed the composer and node services (docker-compose is not intended to be used like that).

Will need someone to verify the updated commands work in bash, as they were developed in within PowerShell and git bash wasn't playing with Docker very well.

@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

Ugh, build errors are caused by composer failing on the PHP v5.6 matrix segment. This is targeting 4.3 (changes here could mess with scripts people have) which will be dropping that version anyway (#937) so in the grand scheme of things the build is green.

@lcharette
Copy link
Copy Markdown
Member

Ugh, build errors are caused by composer failing on the PHP v5.6 matrix segment.

You can pull the latest fix for this from the hotfix branch

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 7, 2019

Codecov Report

Merging #959 into develop will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##             develop     #959   +/-   ##
==========================================
  Coverage      37.71%   37.71%           
  Complexity      2136     2136           
==========================================
  Files            159      159           
  Lines           7265     7265           
==========================================
  Hits            2740     2740           
  Misses          4525     4525
Impacted Files Coverage Δ Complexity Δ
app/sprinkles/core/src/Core.php 100% <ø> (ø) 12 <0> (ø) ⬇️
...inkles/core/src/Session/DatabaseSessionHandler.php 77.77% <ø> (ø) 3 <0> (ø) ⬇️
app/sprinkles/core/src/Sprunje/Sprunje.php 38.96% <ø> (ø) 56 <0> (ø) ⬇️
app/sprinkles/core/src/Database/Seeder/Seeder.php 100% <ø> (ø) 12 <0> (ø) ⬇️
.../sprinkles/admin/src/Controller/UserController.php 0% <0%> (ø) 116 <0> (ø) ⬇️
...sprinkles/admin/src/Controller/GroupController.php 0% <0%> (ø) 61 <0> (ø) ⬇️
...nkles/account/src/Controller/AccountController.php 0% <0%> (ø) 89 <0> (ø) ⬇️
.../sprinkles/admin/src/Controller/RoleController.php 0% <0%> (ø) 80 <0> (ø) ⬇️

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 adec2ed...1da7d3c. Read the comment docs.

@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

hotfix has been integrated, fingers crossed the build works.

@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

CI failures are addressed in hotfix, and are related to fixes released for Assets that tripped up a faulty test.

@lcharette
Copy link
Copy Markdown
Member

This targets 4.3.0 right ?

@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

This targets 4.3.0 right ?

Yeah, it does. Be kinda rude to just break someones workflow in a seemingly minor release.

@lcharette lcharette added this to the 4.3.0 milestone Apr 21, 2019
@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

Getting StyleCI happy is going to be tedious, especially since it appears to have some rules that are at odds with PHP CS Fixer. Out of scope for this IMO.

@lcharette you happy for this to be merged into dev?

@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

https://travis-ci.org/userfrosting/UserFrosting/jobs/522607680
Damn, I recall seeing this in a few previous builds as well.

@Silic0nS0ldier
Copy link
Copy Markdown
Member Author

An intermittent failure. Lovely.

@lcharette
Copy link
Copy Markdown
Member

Getting StyleCI happy is going to be tedious, especially since it appears to have some rules that are at odds with PHP CS Fixer. Out of scope for this IMO.

@lcharette you happy for this to be merged into dev?

CS Fixer rules are as close as I could get them to default StyleCI on, but there's still some missing on CS-Fixer side to be exact same match. Hotfix branch should be fine on styling, so until we merge hotfix into develop, and sync back this PR with develop, error should be expected. Not sure how safe it will be to merge with the partial update from Master?

Meanwhile, I restarted the failing test

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.

2 participants