Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: MariaDB is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/mariadb
Expand Down
3 changes: 2 additions & 1 deletion .examples/docker-compose/insecure/mariadb/fpm/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: MariaDB is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/mariadb
Expand Down Expand Up @@ -45,7 +46,7 @@ services:
- 127.0.0.1:8080:80
volumes:
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
- nextcloud:/var/www/html:z,ro
depends_on:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/postgres
Expand Down
3 changes: 2 additions & 1 deletion .examples/docker-compose/insecure/postgres/fpm/compose.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/postgres
Expand Down Expand Up @@ -40,7 +41,7 @@ services:
- 127.0.0.1:8080:80
volumes:
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
- nextcloud:/var/www/html:z,ro
depends_on:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: MariaDB is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/mariadb
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: MariaDB is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/mariadb
Expand Down Expand Up @@ -44,7 +45,7 @@ services:
restart: always
volumes:
# https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
- ./web/nginx.conf:/etc/nginx/nginx.conf:ro
# NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
- nextcloud:/var/www/html:z,ro
environment:
Expand Down Expand Up @@ -105,7 +106,7 @@ services:
depends_on:
- proxy

# self signed, outdated.
# self signed, outdated.
# omgwtfssl:
# image: paulczar/omgwtfssl
# restart: "no"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/postgres
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
services:
# Note: PostgreSQL is an external service. You can find more information about the configuration here:
# https://hub.docker.com/_/postgres
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/images.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
name: Images

on:
pull_request:
workflow_run:
workflows: ["update.sh"]
branches: [master]
types:
types:
- completed

defaults:
Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/update-sh.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
---
name: update.sh

on:
push:
branches:
- master
- master
schedule:
- cron: '15 18 * * *'
- cron: '15 18 * * *'
workflow_dispatch:

jobs:
run_update_sh:
name: Run update.sh script
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run update.sh script
run: ./update.sh
- name: Commit files
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Workflow"
git add -A
git commit -m "Runs update.sh" || echo "Nothing to update"
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
force: true
- uses: actions/checkout@v4
- name: Run update.sh script
run: ./update.sh
- name: Commit files
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Workflow"
git add -A
git commit -m "Runs update.sh" || echo "Nothing to update"
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
force: true
Loading