Closed dreemkiller closed 3 years ago
rebase is going to be a bit odd, since what i did was split the target specific docker files to their own subdirs -- so basically I 'accepted all' in the main Dockerfile and then just moved the new stuff to a subdir.
On Mon, Jun 21, 2021 at 8:35 AM Derek D. Miller @.***> wrote:
@.**** commented on this pull request.
In Dockerfile https://github.com/veracruz-project/veracruz-docker-image/pull/16#discussion_r655381764 :
@@ -311,10 +314,72 @@ RUN chown -R $USER /work/rust-optee-trustzone-sdk/optee-qemuv8-3.7.0/build/build WORKDIR / RUN ./cleanup.sh
+
probably so. I'm going to do a rebase on top of your changes, and I'll move it.
— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/veracruz-project/veracruz-docker-image/pull/16#discussion_r655381764, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAAQ7WHC4SCA7D72TT2V66DTT453PANCNFSM46XVL3UA .
Yeah, I was using the term "rebase" loosely. More like "rewrite everything on top of the latest version".
Yeah, I was using the term "rebase" loosely. More like "rewrite everything on top of the latest version".
That's done now.
@nspin Is there anything holding this up now?
Can we get this approved? @ShaleXIONG ? It's been sitting here a while.
@DominicPM Do you mind reviewing this? I cant' get any action on it.
Sure, I'll take a look.
Skimmed through manually and only have one comment. I'll checkout locally and try to build, too.
@ShaleXIONG did you check that this builds correctly? I seem to remember you did. If so, I don't need to do it and this can be merged.
@ShaleXIONG did you check that this builds correctly? I seem to remember you did. If so, I don't need to do it and this can be merged.
Yes, I checked it a long time ago, forgot to approve.
+1+1+1 = +1 reached. merging.
Added a new docker target nitro. Certain things needed to be done inside the make file (like building the AWS nitro-cli tools) instead of the docker file as I would have liked.