Skip to content

Commit

Permalink
Remove OSTYPE check and update README file (#408)
Browse files Browse the repository at this point in the history
Remove OSTYPE check in Dockerfile since it is not
necessary. Its value is empty when image is being built.

Cleaned up commands in README file.
  • Loading branch information
cimurah authored May 18, 2022
1 parent 72f7f0b commit 09bbe51
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ Installation

* Establish an SSH tunnel to the replicas (only necessary on local environments)
```bash
$ ./php bin/console toolforge:ssh
$ ./bin/console toolforge:ssh
```
* Bind address for docker enviroments
```bash
$ php bin/console toolforge:ssh --bind-address=0.0.0.0
$ ./bin/console toolforge:ssh --bind-address=0.0.0.0
```

## CLI Usage
Expand Down Expand Up @@ -101,7 +101,7 @@ Run `composer install` to install dependencies required for testing.

Make sure the test database is created and migrations are up-to-date:
```bash
$ ./bin/console doctrine:migrations:database:create --env=test
$ ./bin/console doctrine:database:create --env=test
$ ./bin/console doctrine:migrations:migrate --env=test --no-interaction
```

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ EXPOSE 8080
# work around https://github.com/docker-library/openjdk/blob/0584b2804ed12dca7c5e264b5fc55fc07a3ac148/8-jre/slim/Dockerfile#L51-L54
RUN mkdir -p /usr/share/man/man1

RUN if [[ "$OSTYPE" == "linux-gnu"* ]]; then addgroup --gid $GROUP_ID docker; fi
RUN addgroup --gid $GROUP_ID docker
RUN adduser --disabled-password --gecos '' --uid $USER_ID --gid $GROUP_ID docker

RUN apt-get update -q && apt-get install -y \
Expand Down

0 comments on commit 09bbe51

Please sign in to comment.