Skip to content
This repository has been archived by the owner on May 11, 2022. It is now read-only.

[pull] master from mattermost:master #20

Closed
wants to merge 61 commits into from
Closed

Conversation

pull[bot]
Copy link

@pull pull bot commented Mar 9, 2020

See Commits and Changes for more details.


Created by pull[bot]. Want to support this open source service? Please star it : )

cpoile and others added 16 commits November 6, 2019 14:59
…ind_service=+ep ./bin/mattermost. Note, this is needed internally from the container even if you set the correct CAP_NET_BIND_SERVICE in the docker compose env (#425)
* Call the base container entrypoint with proper arguments

* Build the app container using path to directory

* Add CONTRIBUTING.md
* Fixes for the smooth deployment of Team edition.
	- Just uncommenting out the lines does not work as expected.
	- the line for context is required for it to work for team edition deployment.
	- Added the subsequent changes in the installation instructions in README.md

* Adding changes as suggested by @ccoenen
  - making the changes more clear in the code block
  - adding more textual clarity in the sentence on what needs to be changed.
I tried to use wal-e as mentioned on dockerhub (see https://hub.docker.com/r/mattermost/mattermost-prod-db). To do the base backup I had to do some additional steps (see #346):
- mount a volume into the database docker container (path in the container is /etc/wal-e.d/env) and put all credentials and the s3 prefix to this folder
- exec into the container and create a superuser (Command: CREATE USER postgres SUPERUSER;)

Now it still fails with the message, that the package *pv* is missing
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Mar 9, 2020
potaito and others added 12 commits March 13, 2020 09:58
In this commit I'm adding some logic to ensure that the `entrypoint.sh`
file handles a pre-existing `mattermost.conf` file within the nginx
folder.

During deployment of some more custom nginx configuration it was
noticed that the linking process fails, because a file already exists
with the filesystem.

Signed-off-by: Akendo <akendo@akendo.eu>
currently, if you follow the instructions and uncomment the lines, you
will get a YAML error:

```
ERROR: yaml.parser.ParserError: while parsing a block mapping
  in "./docker-compose.yml", line 23, column 5
expected <block end>, but found '<block mapping start>'
  in "./docker-compose.yml", line 25, column 7
```

found the potential solution in #343

Co-authored-by: mattermod <mattermod@users.noreply.github.com>
Currently the command `docker-compose build` throws an error for building the database because it uses an old pip version.

This PR updates pip right before it is called. Anyways this should just be a temporary fix because the image uses Python 2.7 wich out of support since Jan 2020
cpanato and others added 29 commits June 23, 2020 11:06
Co-authored-by: francois-d <dfrancis2.primus.ca>
* be consistent with the use of tabs

* tabs; shellcheck; consistency

* use tabs
* use shellcheck to fix non POSIX stuff
* be consistent with the use of quotes and if-then-else / for-do-done
…w optional DB_SSLMODE (defaults to current value of "disable") following values allowed by PostgreSQL (#506)

* change to support environment variable configuration of SSL mode for PostgreSQL connections
* Updated Shell Script Format

Signed-off-by: Spencer <wf6DJd8a3xSSCZbn@protonmail.com>
* make MM_VERSION an ARG instead of an ENV
* Update README.md

* Update README.md

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>

* Update README.md

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>

* Update README.md

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>

Co-authored-by: Carrie Warner (Mattermost) <74422101+cwarnermm@users.noreply.github.com>
- upgrade python-dev to python3-dev since python2 is no longer available
- py-pi to pi3-pip
* Update Dockerfile

libressl-dev is no longer needed, it will make the build fail.

* Update Dockerfile

Bumped MM_VERSION to 5.36.0 since 5.31.0 is no longer maintained and it will display deprecation message on mobile devices.
* Update README.md

Update README with a context of the status of this repo & a link to new repo.

* Update README.md
@bsedat bsedat closed this May 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Development

Successfully merging this pull request may close these issues.