Compare commits

..
16 changed files with 13 additions and 70 deletions
+3 -3
View File
@@ -3,7 +3,7 @@ kind: pipeline
name: deploy to swarm-test.autonomic.zone
steps:
- name: deployment
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest@sha256:fc1fa69bea5528db7ba184297735ac1bbd278720910e4cb1f502de9aee14e228
image: git.coopcloud.tech/coop-cloud/stack-ssh-deploy:latest
settings:
host: swarm-test.autonomic.zone
stack: mattermost
@@ -17,7 +17,7 @@ steps:
LETS_ENCRYPT_ENV: production
- name: notify coopcloud-dev on failure
image: plugins/matrix@sha256:9202a26fbadeaa949c2ad0009aa5758277fb10b178f4909afc1d827d6456214e
image: plugins/matrix
settings:
homeserver: https://matrix.autonomic.zone
roomid: "IFazIpLtxiScqbHqoa:autonomic.zone"
@@ -38,7 +38,7 @@ kind: pipeline
name: generate recipe catalogue
steps:
- name: release a new version
image: plugins/downstream@sha256:03ff02d8a5637ea5197fa08929a91dfeeb5e30b1da62b82b6c2a895b170338ca
image: plugins/downstream
settings:
server: https://build.coopcloud.tech
token:
+1 -4
View File
@@ -33,7 +33,4 @@ ORG_NAME="My Organization"
#SSO_DOMAIN=accounts.example.com
#SSO_APP=mattermost
#SSO_ID=
#SECRET_MATTERMOST_SSO_SECRET_VERSION=v1
## Enable enterprise version (requires a valid license)
#COMPOSE_FILE="$COMPOSE_FILE:compose.license.yml"
#SECRET_MATTERMOST_SSO_SECRET_VERSION=v1
-10
View File
@@ -79,16 +79,6 @@ This is how to configure your Mattermost server to accept logins from your Authe
- Go to https://YOURAPPNAME/admin_console/authentication/email
- Set **Enable sign-in with email** and **Enable sign-in with username** to `false`
## Use a Mattermost Enterprise License
**NOTE: This deploys non-FOSS code and requires you to pay Mattermost for a license to enable features. Not recommended unless you know what you're doing.**
- `abra app config YOURAPPNAME`
- Uncomment the section which starts with `## Enable enterprise version`
- `abra app undeploy YOURAPPNAME`
- `abra app deploy YOURAPPNAME`
# Technical Notes
This recipe inserts a statically-compiled busybox binary from `busybox:1.25-uclibc` into the distroless container, to allow running the custom entrypoint shell script which configures Mattermost.
[`abra`]: https://git.coopcloud.tech/coop-cloud/abra
[`coop-cloud/traefik`]: https://git.coopcloud.tech/coop-cloud/traefik
+1 -2
View File
@@ -1,6 +1,5 @@
export ENTRYPOINT_VERSION=v3
export ENTRYPOINT_VERSION=v1
export MATTERMOST_CONFIG_VERSION=v1
export SHELL_VERSION=v1
reset_config() {
cp /config-to-copy.json /mattermost/config/config.json && touch /mattermost/config/CoopCloudManaged
BIN
View File
Binary file not shown.
-5
View File
@@ -1,5 +0,0 @@
version: "3.8"
services:
app:
image: mattermost/mattermost-enterprise-edition:10.11.23@sha256:6f927863c529a246bb7c4c55156611306bae952142534fa39cb724d85f85769d
+5 -11
View File
@@ -2,7 +2,7 @@ version: "3.8"
services:
app:
image: mattermost/mattermost-team-edition:10.11.23@sha256:1e6be48c49ccd4824cdbe045ac226b9c632ceaa30bf812ce70ca4de45cb86b9c
image: mattermost/mattermost-team-edition:10.5.0
environment:
- TZ
- MM_SQLSETTINGS_DRIVERNAME=postgres
@@ -26,16 +26,13 @@ services:
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
- "traefik.http.routers.${STACK_NAME}.middlewares=${STACK_NAME}-redirect"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLForceHost=true"
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
- "coop-cloud.${STACK_NAME}.version=2.3.0+10.11.23"
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.scheme=https"
- "traefik.http.middlewares.${STACK_NAME}-redirect.redirectscheme.permanent=true"
- "coop-cloud.${STACK_NAME}.version=1.5.3+9.11.8"
- "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT:-120}"
- "backupbot.backup=true"
- "backupbot.backup.path=/mattermost,/etc/ssl"
configs:
- source: busybox
target: /bin/busybox
mode: 0555
- source: abra_mattermost_entrypoint
target: /abra-mattermost-entrypoint.sh
mode: 0555
@@ -44,7 +41,7 @@ services:
entrypoint: /abra-mattermost-entrypoint.sh
postgres:
image: pgautoupgrade/pgautoupgrade:18-alpine@sha256:722599f0fe6483f2a97e765066e23122a780b4ea221287edfaaf67268af6757a
image: postgres:15-alpine
volumes:
- postgres_data:/var/lib/postgresql/data
environment:
@@ -72,9 +69,6 @@ configs:
abra_mattermost_entrypoint:
name: ${STACK_NAME}_entrypoint_${ENTRYPOINT_VERSION}
file: ./entrypoint.sh
busybox:
name: ${STACK_NAME}_busybox_${SHELL_VERSION}
file: ./bin/busybox
networks:
+3 -14
View File
@@ -1,13 +1,4 @@
#!/bin/busybox sh
/bin/busybox mkdir /tmp/bin
export PATH=$PATH:/tmp/bin
/bin/busybox ln -s /bin/busybox /tmp/bin/ln
ln -s /bin/busybox /tmp/bin/cat
ln -s /bin/busybox /tmp/bin/echo
ln -s /bin/busybox /tmp/bin/cp
ln -s /bin/busybox /tmp/bin/touch
ln -s /bin/busybox /tmp/bin/rm
#!/bin/sh
set -e
if test -f "/run/secrets/postgres_password"; then
pwd=`cat /run/secrets/postgres_password`
@@ -30,7 +21,5 @@ if ! test -f "/mattermost/config/CoopCloudManaged"; then
cp /config-to-copy.json /mattermost/config/config.json && touch /mattermost/config/CoopCloudManaged
fi
rm -rf /tmp/bin
# https://github.com/mattermost/mattermost/blob/master/server/build/Dockerfile
/mattermost/bin/mattermost
# https://github.com/mattermost/mattermost-server/blob/master/build/Dockerfile
/entrypoint.sh "mattermost"
-1
View File
@@ -1 +0,0 @@
Upgrade to Mattermost 10.11.13
-1
View File
@@ -1 +0,0 @@
Upgrade to Mattermost 10.11.14
-1
View File
@@ -1 +0,0 @@
Update Mattermost to v10.11.19
-1
View File
@@ -1 +0,0 @@
Update to 10.11.21
-1
View File
@@ -1 +0,0 @@
Update to version 10.11.22
-1
View File
@@ -1 +0,0 @@
Update to 10.11.23
-1
View File
@@ -1 +0,0 @@
WARNING: Take a backup before upgrading to this release. This release moves from Postgres 16 to pgautoupgrade 18.
-14
View File
@@ -1,14 +0,0 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"packageRules": [
{
"matchDatasources": [
"docker"
],
"pinDigests": true
}
]
}