Skip to content

Conversation

@GodloveD
Copy link
Contributor

@vsoch I started with master here, made some changes, created a branch and then merged 2.4 into it. Looks like it picked up some commits that you made to master. These appear to be things that should also be added to the 2.4 branch as well, but you should make the final call. I've checked the box that Allows edits from maintainers so if something needs tweaking feel free to have at it.

vsoch and others added 15 commits August 1, 2017 23:22
Not sure if this was a typo or a snarky insider joke by a Perl/Ruby programmer....
* Type: One -> On

* Wordsmithing
There is no `docker -ps` command.  The docker `ps` subcommand lists containers.  The docker `history` subcommand will list the layers, like so:

```
hartzelg@blah:~$ docker history hartzelg/cime
IMAGE               CREATED             CREATED BY                                      SIZE                COMMENT
7185c64fa2a5        5 months ago        /bin/sh -c #(nop) VOLUME [/cime_config.yaml]    0 B
fd53e85b356b        5 months ago        /bin/sh -c #(nop) VOLUME [/var/jenkins_home]    0 B
b50f22ae6ec1        5 months ago        /bin/sh -c #(nop) COPY file:fb917d778dfa959bb   10.11 kB
[...]
```
"pids" is process ids, I think?

What you mean is the users numeric id, e.g. on machine A `hartzell` is `3245` so files are owned by `3245`.  But, when I get to machine B where `hartzell` is `22453`, those same files appear to be someone else.

Right?
@vsoch
Copy link
Member

vsoch commented Aug 22, 2017

Thanks @GodloveD ! I just merged this by pushing from another branch (also with the updates from old master, and new updates to master) and we are good to go! Thanks again for these awesome fixes, you are the 💯 documentation masta' winner!

@vsoch vsoch closed this Aug 22, 2017
@GodloveD
Copy link
Contributor Author

GodloveD commented Aug 22, 2017

Woo Hoo. Thanks for catching those typos Ms Host System. 😜

@GodloveD GodloveD deleted the nv-and-env branch August 22, 2017 13:39
@GodloveD
Copy link
Contributor Author

Wait. This didn't work properly. I added documentation for the $SINGULARITY_ENVIRONMENT variable in this request and it got lost. Can you have a look?

@GodloveD
Copy link
Contributor Author

For instance, I'm not seeing this line or those below it in the merged version. https://github.com/singularityware/singularityware.github.io/pull/101/files#diff-cea51d4d0c721b07ad02aea1a5319049R154
Am I missing something?

@vsoch
Copy link
Member

vsoch commented Aug 22, 2017

yeah I don't understand why that happened! I merged your branch with this change and it went away. Can you open this again so we can compare again? Sorry about that :(

@GodloveD
Copy link
Contributor Author

I'm pretty sure it was because I did something silly in Git. With all the time I've invested in Git I will be really surprised if it ever actually saves me any time.

Unfortunately, I got a little trigger happy after I saw that the PR was closed, so I can't re-open the PR. 😱
screen shot 2017-08-22 at 12 33 27 pm

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.

4 participants