Skip to content

ci: allows files to be shared by docker images - #41958

Merged
bors merged 4 commits into
rust-lang:masterfrom
malbarbo:docker-share
May 19, 2017
Merged

ci: allows files to be shared by docker images#41958
bors merged 4 commits into
rust-lang:masterfrom
malbarbo:docker-share

Conversation

@malbarbo

@malbarbomalbarbo commented May 12, 2017•
edited
Loading

Copy link
Copy Markdown
Contributor

Change src/ci/docker/run.sh to allow files to be shared when building docker containers. For while, only android related shell scripts are shared. Others containers can be updated at any time.

sccache is installed last, as it is frequently updated this avoids the need to rebuilt the whole container.

@rust-highfive

rust-highfive commented May 12, 2017

Copy link
Copy Markdown
Contributor

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

@malbarbo

malbarbo commented May 12, 2017

Copy link
Copy Markdown
ContributorAuthor

r? @alexcrichton

@alexcrichton

alexcrichton commented May 12, 2017

Copy link
Copy Markdown
Member

Thanks! A few thoughts here:

  • Could you update the README.md in the directory with a short explanation of the new filesystem layout? Basically that all containers have access to all these scripts and such.
  • Could you go ahead and remove the "old way" of building a container? I'd prefer to not maintain a whole bunch of methods of building the containers, although having a "disabled" and "not disabled" path seems ok (at maximum). This'll involve updating the COPY paths of existing containers, but I think that's ok, we can deduplicate those scripts later.
  • After this lands, mind opening up an issue to continue to deduplicate these scripts? I'm thinking things like hide_output as well as installing sccache would be great candidates.
  • For now could this avoid deduplicating the apt-get install phases? I've found that to be ever-so-subtly different across all the containers so I'm hesitant to start trying to extract subsets again.

@bors

bors commented May 13, 2017

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #41955) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-SimulacrumMark-Simulacrum added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 14, 2017
@malbarbomalbarbo changed the title ci: share android shell scriptsci: allows files to be shared by docker imagesMay 18, 2017
@malbarbo

malbarbo commented May 18, 2017

Copy link
Copy Markdown
ContributorAuthor

Done. Let's travis tests with I missed some Dockerfile update.

@alexcrichton

alexcrichton commented May 18, 2017

Copy link
Copy Markdown
Member

@bors: r+

Looks great, thanks so much for this @malbarbo!

@bors

bors commented May 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 502eadb has been approved by alexcrichton

@bors

bors commented May 18, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 502eadb with merge ee46e78...

@bors

bors commented May 18, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@malbarbo

malbarbo commented May 18, 2017

Copy link
Copy Markdown
ContributorAuthor

Fixed dist-powerpc-linux

@alexcrichton

alexcrichton commented May 18, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented May 18, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 9b184c0 has been approved by alexcrichton

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 18, 2017
@Mark-Simulacrum
Rollup merge ofrust-lang#41958- malbarbo:docker-share, r=alexcrichton
cd91a7d
ci: allows files to be shared by docker images
Change `src/ci/docker/run.sh` to allow files to be shared when building docker containers. For while, only android related shell scripts are shared. Others containers can be updated at any time.
sccache is installed last, as it is frequently updated this avoids the need to rebuilt the whole container.
@Mark-SimulacrumMark-Simulacrum mentioned this pull request May 18, 2017
Closed
@bors

bors commented May 19, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 9b184c0 with merge d205555...

@bors

bors commented May 19, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

alexcrichton commented May 19, 2017

Copy link
Copy Markdown
Member

@bors: retry

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request May 19, 2017
@Mark-Simulacrum
Rollup merge ofrust-lang#41958- malbarbo:docker-share, r=alexcrichton
04b0779
ci: allows files to be shared by docker images
Change `src/ci/docker/run.sh` to allow files to be shared when building docker containers. For while, only android related shell scripts are shared. Others containers can be updated at any time.
sccache is installed last, as it is frequently updated this avoids the need to rebuilt the whole container.
@Mark-SimulacrumMark-Simulacrum mentioned this pull request May 19, 2017
Merged
bors added a commit that referenced this pull request May 19, 2017
@bors
Auto merge of#42105- Mark-Simulacrum:rollup, r=Mark-Simulacrum
5dfcd85
Rollup of 17 pull requests
- Successful merges: #41870, #41910, #41958, #41971, #42006, #42024, #42037, #42056, #42067, #42070, #42079, #42080, #42082, #42089, #42092, #42096, #42100
- Failed merges:
@bors
bors merged commit 9b184c0 into rust-lang:masterMay 19, 2017
@malbarbomalbarbo mentioned this pull request May 24, 2017
Closed
35 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@malbarbo@rust-highfive@alexcrichton@bors@nikomatsakis@Mark-Simulacrum