| Message ID | 20191029072616.9212-1-dja@axtens.net |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/3] README: fix .env | expand |
On Tue, 2019-10-29 at 18:26 +1100, Daniel Axtens wrote: > The .env setup didn't do GID. It's a bit of a chore to do because > there doesn't seem to be a GID shell variable and because we need > to do a bit more work to get a multi-line thing, but this should > work. > > While we're at it, change the docker-compose info, it's hopelessly > out of date. > > Signed-off-by: Daniel Axtens <dja@axtens.net> All three of these look good to me. I haven't applied them since I think we should revert the "drop Django 2.0" patch until Patchwork 2.2 is released and don't want to introduce merge conflicts on that. If/when that's done though, Reviewed-by: Stephen Finucane <stephen@that.guru> > --- > README.rst | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/README.rst b/README.rst > index f5fc1d1aba76..6cc74d4cc043 100644 > --- a/README.rst > +++ b/README.rst > @@ -58,11 +58,12 @@ environment. To install Patchwork: > $ git clone https://github.com/getpatchwork/patchwork.git > > 3. Create a ``.env`` file in the root directory of the project and store your > - ``UID`` attribute there:: > + ``UID`` and ``GID`` attributes there:: > > - $ cd patchwork && echo "UID=$UID" > .env > + $ cd patchwork && printf "UID=$(id -u)\nGID=$(id -g)\n" > .env > > -4. Build the images. This will download over 200MB from the internet:: > +4. Build the images. This will download a number of packages from the internet, > + and compile several versions of Python:: > > $ docker-compose build >
Stephen Finucane <stephen@that.guru> writes: > On Tue, 2019-10-29 at 18:26 +1100, Daniel Axtens wrote: >> The .env setup didn't do GID. It's a bit of a chore to do because >> there doesn't seem to be a GID shell variable and because we need >> to do a bit more work to get a multi-line thing, but this should >> work. >> >> While we're at it, change the docker-compose info, it's hopelessly >> out of date. >> >> Signed-off-by: Daniel Axtens <dja@axtens.net> > > All three of these look good to me. I haven't applied them since I > think we should revert the "drop Django 2.0" patch until Patchwork 2.2 > is released and don't want to introduce merge conflicts on that. > If/when that's done though, > > Reviewed-by: Stephen Finucane <stephen@that.guru> I did that already and pushed the revert. I am happy to rebase and apply later today. I was also thinking about applying Allow ordering events by date, and was hoping for your comments on the audit log series. I'm still trying to carve out time for the Relations series, and I think if we can land that I'll be really happy for us to cut 2.2. > >> --- >> README.rst | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/README.rst b/README.rst >> index f5fc1d1aba76..6cc74d4cc043 100644 >> --- a/README.rst >> +++ b/README.rst >> @@ -58,11 +58,12 @@ environment. To install Patchwork: >> $ git clone https://github.com/getpatchwork/patchwork.git >> >> 3. Create a ``.env`` file in the root directory of the project and store your >> - ``UID`` attribute there:: >> + ``UID`` and ``GID`` attributes there:: >> >> - $ cd patchwork && echo "UID=$UID" > .env >> + $ cd patchwork && printf "UID=$(id -u)\nGID=$(id -g)\n" > .env >> >> -4. Build the images. This will download over 200MB from the internet:: >> +4. Build the images. This will download a number of packages from the internet, >> + and compile several versions of Python:: >> >> $ docker-compose build >>
Series applied, thanks. Stephen Finucane <stephen@that.guru> writes: > On Tue, 2019-10-29 at 18:26 +1100, Daniel Axtens wrote: >> The .env setup didn't do GID. It's a bit of a chore to do because >> there doesn't seem to be a GID shell variable and because we need >> to do a bit more work to get a multi-line thing, but this should >> work. >> >> While we're at it, change the docker-compose info, it's hopelessly >> out of date. >> >> Signed-off-by: Daniel Axtens <dja@axtens.net> > > All three of these look good to me. I haven't applied them since I > think we should revert the "drop Django 2.0" patch until Patchwork 2.2 > is released and don't want to introduce merge conflicts on that. > If/when that's done though, > > Reviewed-by: Stephen Finucane <stephen@that.guru> > >> --- >> README.rst | 7 ++++--- >> 1 file changed, 4 insertions(+), 3 deletions(-) >> >> diff --git a/README.rst b/README.rst >> index f5fc1d1aba76..6cc74d4cc043 100644 >> --- a/README.rst >> +++ b/README.rst >> @@ -58,11 +58,12 @@ environment. To install Patchwork: >> $ git clone https://github.com/getpatchwork/patchwork.git >> >> 3. Create a ``.env`` file in the root directory of the project and store your >> - ``UID`` attribute there:: >> + ``UID`` and ``GID`` attributes there:: >> >> - $ cd patchwork && echo "UID=$UID" > .env >> + $ cd patchwork && printf "UID=$(id -u)\nGID=$(id -g)\n" > .env >> >> -4. Build the images. This will download over 200MB from the internet:: >> +4. Build the images. This will download a number of packages from the internet, >> + and compile several versions of Python:: >> >> $ docker-compose build >>
diff --git a/README.rst b/README.rst index f5fc1d1aba76..6cc74d4cc043 100644 --- a/README.rst +++ b/README.rst @@ -58,11 +58,12 @@ environment. To install Patchwork: $ git clone https://github.com/getpatchwork/patchwork.git 3. Create a ``.env`` file in the root directory of the project and store your - ``UID`` attribute there:: + ``UID`` and ``GID`` attributes there:: - $ cd patchwork && echo "UID=$UID" > .env + $ cd patchwork && printf "UID=$(id -u)\nGID=$(id -g)\n" > .env -4. Build the images. This will download over 200MB from the internet:: +4. Build the images. This will download a number of packages from the internet, + and compile several versions of Python:: $ docker-compose build
The .env setup didn't do GID. It's a bit of a chore to do because there doesn't seem to be a GID shell variable and because we need to do a bit more work to get a multi-line thing, but this should work. While we're at it, change the docker-compose info, it's hopelessly out of date. Signed-off-by: Daniel Axtens <dja@axtens.net> --- README.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)