Skip to content

Commit

Permalink
Bump super-linter/super-linter from 6 to 7
Browse files Browse the repository at this point in the history
Bumps [super-linter/super-linter](https://github.com/super-linter/super-linter) from 6 to 7.
- [Release notes](https://github.com/super-linter/super-linter/releases)
- [Changelog](https://github.com/super-linter/super-linter/blob/main/CHANGELOG.md)
- [Commits](super-linter/super-linter@v6...v7)

---
updated-dependencies:
- dependency-name: super-linter/super-linter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
  • Loading branch information
dependabot[bot] authored and dfh committed Jan 7, 2025
1 parent 68f12e9 commit 344734b
Show file tree
Hide file tree
Showing 10 changed files with 104 additions and 102 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
inputs:
ssh_debug_enabled:
type: boolean
description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
description: "Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)"
required: false
default: false

Expand Down Expand Up @@ -109,14 +109,14 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-${{ matrix.version }}-git-${{ env.GIT_REV }}-allinone
- name: Load images
- name: Load images
run: |
docker load --input "build-${{ matrix.version }}-git-${GIT_REV}-allinone.tar.gz"
- name: replace image
run: sed -i "s/docker.io\/mriedmann\/humhub:latest/ghcr.io\/${CI_REPOSITORY_OWNER}\/humhub:${CI_REF_NAME_SLUG}-${HUMHUB_VERSION}-git-${GIT_REV}-allinone/g" docker-compose.yml
- name: Spin up services
run: docker compose -f docker-compose.yml up -d
- name: Wait
- name: Wait
run: sleep 120
- name: Check status
run: docker ps -a
Expand All @@ -128,7 +128,8 @@ jobs:
- name: Test
run: curl 'http://localhost:8080/' --location --fail --silent | grep 'Sign in</button>' -q || ( curl 'http://localhost:8080/' --trace - ; exit 1;)
- name: Test Email
run: docker compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email '[email protected]' --interactive=0 \
run:
docker compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email '[email protected]' --interactive=0 \
| grep 'Message successfully sent!' -q
- name: Collect HumHub server logs
if: ${{ always() }}
Expand Down Expand Up @@ -160,7 +161,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-${{ matrix.version }}-git-${{ env.GIT_REV }}-nginx
- name: Load images
- name: Load images
run: |
docker load --input "build-${{ matrix.version }}-git-${GIT_REV}-phponly.tar.gz"
docker load --input "build-${{ matrix.version }}-git-${GIT_REV}-nginx.tar.gz"
Expand All @@ -170,7 +171,7 @@ jobs:
sed -i "s/docker.io\/mriedmann\/humhub:stable-phponly/ghcr.io\/${CI_REPOSITORY_OWNER}\/humhub:${CI_REF_NAME_SLUG}-${HUMHUB_VERSION}-git-${GIT_REV}-phponly/g" docker-compose.prod.yml
- name: Spin up services
run: docker compose -f docker-compose.prod.yml up -d
- name: Wait
- name: Wait
run: sleep 120
- name: Check status
run: docker ps -a
Expand Down Expand Up @@ -215,7 +216,7 @@ jobs:
uses: actions/download-artifact@v4
with:
name: build-${{ matrix.version }}-git-${{ env.GIT_REV }}-${{ matrix.target }}
- name: Load, retag and Push images
- name: Load, retag and Push images
run: |
export REPO_OWNER="ghcr.io/${GITHUB_REPOSITORY_OWNER}"
export IMAGE_URL="${REPO_OWNER}/humhub:${CI_REF_NAME_SLUG}-${HUMHUB_VERSION}-git-${GIT_REV}-${{ matrix.target }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
# Run Linter against code base #
################################
- name: Lint Code Base
uses: super-linter/super-linter@v6
uses: super-linter/super-linter@v7
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_PHP_PHPSTAN: false
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/robots.txt.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
name: "Update robots.txt"
on:
schedule:
- cron: "0 0 * * 6" # At 00:00 on Saturday
workflow_dispatch:
schedule:
- cron: "0 0 * * 6" # At 00:00 on Saturday
workflow_dispatch:

jobs:
update:
name: "Update robots.txt"
update:
name: "Update robots.txt"

runs-on: ubuntu-latest
runs-on: ubuntu-latest

permissions:
contents: write
permissions:
contents: write

steps:
- name: Checkout repository
uses: actions/checkout@v4
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Pull latest robots
run: |
curl -X POST https://api.darkvisitors.com/robots-txts \
-H "Authorization: Bearer ${{ secrets.DarkVisitorsBearer }}" \
-H "Content-Type: application/json" \
--data-raw '{"agent_types": ["AI Assistant", "AI Data Scraper", "AI Search Crawler", "Undocumented AI Agent"]}' \
--output ./base/var/www/localhost/htdocs/robots.txt
- name: Pull latest robots
run: |
curl -X POST https://api.darkvisitors.com/robots-txts \
-H "Authorization: Bearer ${{ secrets.DarkVisitorsBearer }}" \
-H "Content-Type: application/json" \
--data-raw '{"agent_types": ["AI Assistant", "AI Data Scraper", "AI Search Crawler", "Undocumented AI Agent"]}' \
--output ./base/var/www/localhost/htdocs/robots.txt
- name: Commit changes
uses: EndBug/add-and-commit@v9
with:
message: "chore: generate robots.txt"
default_author: github_actions
push: true
- name: Commit changes
uses: EndBug/add-and-commit@v9
with:
message: "chore: generate robots.txt"
default_author: github_actions
push: true
6 changes: 3 additions & 3 deletions .github/workflows/update-humhub.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: check-update
workflow_dispatch:
schedule:
- cron: "0 0 * * *"
- cron: "0 0 * * *"

jobs:
execute:
Expand Down Expand Up @@ -35,7 +35,7 @@ jobs:
- name: pull-request
uses: repo-sync/pull-request@v2
with:
source_branch: "${{ env.GIT_BRANCH }}"
destination_branch: "master"
source_branch: "${{ env.GIT_BRANCH }}"
destination_branch: "master"
pr_title: "Bump HumHub to ${{ env.NEW_VERSION }}"
github_token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .markdown-lint.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
{"default": true, "MD013": null, "MD028": null, "MD033": null}
{ "default": true, "MD013": null, "MD028": null, "MD033": null }
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ before_install:
script:
- curl http://localhost:8080/ -L --fail -s | grep 'Sign in</button>' -q
- docker-compose exec -w '/var/www/localhost/htdocs/protected' -T humhub php yii test/email '[email protected]' \
| grep 'Message successfully sent!' -q
| grep 'Message successfully sent!' -q
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<details>
<summary>Original README of <a href="https://github.com/mriedmann/humhub-docker" target="_blank">mriedmann/humhub-docker</a></summary>

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e2c25ed0c4ce479aa9a97be05d1d5b20)](https://app.codacy.com/app/mriedmann/humhub-docker?utm_source=github.com&utm_medium=referral&utm_content=mriedmann/humhub-docker&utm_campaign=Badge_Grade_Dashboard) ![Docker Image CI](https://github.com/mriedmann/humhub-docker/workflows/Docker%20Image%20CI/badge.svg) ![Docker Pulls](https://img.shields.io/docker/pulls/mriedmann/humhub) [![Join the chat at https://gitter.im/humhub-docker/community](https://badges.gitter.im/humhub-docker/community.svg)](https://gitter.im/humhub-docker/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e2c25ed0c4ce479aa9a97be05d1d5b20)](https://app.codacy.com/app/mriedmann/humhub-docker?utm_source=github.com&utm_medium=referral&utm_content=mriedmann/humhub-docker&utm_campaign=Badge_Grade_Dashboard) ![Docker Image CI](https://github.com/mriedmann/humhub-docker/workflows/Docker%20Image%20CI/badge.svg) ![Docker Pulls](https://img.shields.io/docker/pulls/mriedmann/humhub) [![Join the chat at https://gitter.im/humhub-docker/community](https://badges.gitter.im/humhub-docker/community.svg)](https://gitter.im/humhub-docker/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

> :warning: **Version Shift**: We lately changed the versions of latest (1.9->1.10) / stable (1.8->1.9) / legacy (1.8). This can lead to an unexpected update when you are using these moving tags. If you do not want to upgrade, use the corresponding version-tags.
> :warning: **Image Removal**: We have purged all registries from End-Of-Life images (1.4,1.5,1.6). These images were not maintained anymore and contained major security flaws. To protect the public we removed them. If you really want to use these images, you have to build them from source.
Expand Down Expand Up @@ -41,12 +41,12 @@ If plan to build some kind of hosted solution, have a look at `docker-compose.pr
- You can use **Testing** Versions if you need special new features. The newest HumHub versions will be first released in this way to find migration bugs in a save way. If you want to test upgrades to the next major version, this can be done with this tag.
- **Experimental** is reserved for development of this project and always defines an early and potentially broken build. We are doing our best to avoid broken releases to latest, but please be warned and do not use this in production environments.

| Version | Status | AllInOne | Nginx | PHP-Only |
| ------- | ----------------------- | --------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------ |
| `1.8` | :thumbsdown: Deprecated | [![humhub:1.8](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.8-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.8](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.8--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.8](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.8--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| `1.9` | :thumbsdown: Deprecated | [![humhub:1.9](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.9-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.9](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.9--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.9](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.9--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| `1.10` | :thumbsup: Stable | [![humhub:1.10](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.10-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.10](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.10--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.10](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.10--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| `1.11` | :boom: Experimental | [![humhub:1.11](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.11-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.11](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.11--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.11](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.11--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| Version | Status | AllInOne | Nginx | PHP-Only |
| ------- | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------- |
| `1.8` | :thumbsdown: Deprecated | [![humhub:1.8](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.8-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.8](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.8--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.8](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.8--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| `1.9` | :thumbsdown: Deprecated | [![humhub:1.9](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.9-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.9](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.9--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.9](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.9--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| `1.10` | :thumbsup: Stable | [![humhub:1.10](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.10-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.10](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.10--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.10](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.10--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |
| `1.11` | :boom: Experimental | [![humhub:1.11](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.11-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.11](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.11--nginx-blue)](https://hub.docker.com/r/mriedmann/humhub) | [![humhub:1.11](https://img.shields.io/badge/image-mriedmann%2Fhumhub%3A1.11--phponly-blue)](https://hub.docker.com/r/mriedmann/humhub) |

| Flavor | Stable | Latest | Legacy |
| -------- | ------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
Expand Down Expand Up @@ -224,6 +224,7 @@ HUMHUB_REVERSEPROXY_WHITELIST ["127.0.0.1"]
## Contribution

Please use the issues-page for bugs or suggestions. Pull-requests are highly welcomed.

</details>

## Special Thanks
Expand Down
48 changes: 24 additions & 24 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# NOTE: This files shows a possible production setup.
# If you are not familiar with handling containers in production, please
# consider a different approach of hosting. This setup can lead to
# errors and loss of production data if handled incorrectly. Currently
# If you are not familiar with handling containers in production, please
# consider a different approach of hosting. This setup can lead to
# errors and loss of production data if handled incorrectly. Currently

# WARNING: Currently, container based setups are not officially supported by Humhub GmbH.
# Use at your own risk!
---
version: '3.1'
version: "3.1"
services:
nginx:
image: docker.io/mriedmann/humhub:stable-nginx
Expand All @@ -25,21 +25,21 @@ services:
humhub:
image: docker.io/mriedmann/humhub:stable-phponly
expose:
- '9000'
- "9000"
environment:
HUMHUB_DB_USER: ${HUMHUB_DB_USER}
HUMHUB_DB_PASSWORD: ${HUMHUB_DB_PASSWORD}
HUMHUB_DB_HOST: 'db'
HUMHUB_DB_NAME: 'humhub'
HUMHUB_DB_HOST: "db"
HUMHUB_DB_NAME: "humhub"
HUMHUB_AUTO_INSTALL: 1
# HUMHUB_DEBUG: 1 # you can currently not use debug in prod
HUMHUB_PROTO: 'https'
HUMHUB_HOST: 'localhost'
# HUMHUB_DEBUG: 1 # you can currently not use debug in prod
HUMHUB_PROTO: "https"
HUMHUB_HOST: "localhost"
# Mailer install setup
HUMHUB_MAILER_SYSTEM_EMAIL_ADDRESS: '[email protected]'
HUMHUB_MAILER_SYSTEM_EMAIL_NAME: 'HumHub'
HUMHUB_MAILER_TRANSPORT_TYPE: 'smtp'
HUMHUB_MAILER_HOSTNAME: 'mailer'
HUMHUB_MAILER_SYSTEM_EMAIL_ADDRESS: "[email protected]"
HUMHUB_MAILER_SYSTEM_EMAIL_NAME: "HumHub"
HUMHUB_MAILER_TRANSPORT_TYPE: "smtp"
HUMHUB_MAILER_HOSTNAME: "mailer"
HUMHUB_MAILER_PORT: 1025
#HUMHUB_MAILER_USERNAME:
#HUMHUB_MAILER_PASSWORD:
Expand All @@ -57,7 +57,7 @@ services:
- "assets:/var/www/localhost/htdocs/assets"
- "modules:/var/www/localhost/htdocs/protected/modules"
- "themes:/var/www/localhost/htdocs/themes"
# - "${HUMHUB_VOLUME_CONFIG}:/var/www/localhost/htdocs/protected/config"
# - "${HUMHUB_VOLUME_CONFIG}:/var/www/localhost/htdocs/protected/config"
healthcheck:
test: ["CMD", "php-fpm-healthcheck"]
interval: 30s
Expand All @@ -67,7 +67,7 @@ services:
image: mariadb:10.4
environment:
MYSQL_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD}
MYSQL_DATABASE: 'humhub'
MYSQL_DATABASE: "humhub"
MYSQL_USER: ${HUMHUB_DB_USER}
MYSQL_PASSWORD: ${HUMHUB_DB_PASSWORD}
volumes:
Expand All @@ -87,17 +87,17 @@ services:
redis:
image: redis:5.0-alpine
expose:
- '6379'
# volumes:
# - /srv/humhub/redis:/data
- "6379"
# volumes:
# - /srv/humhub/redis:/data
environment:
- REDIS_PASSWORD=redis_password
#- ALLOW_EMPTY_PASSWORD=yes
healthcheck:
test: ["CMD", "redis-cli", "ping"]
volumes:
uploads: { }
assets: { }
modules: { }
themes: { }
mysql: { }
uploads: {}
assets: {}
modules: {}
themes: {}
mysql: {}
Loading

0 comments on commit 344734b

Please sign in to comment.