diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index c05d7d8e6..6cebfa75a 100644 --- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml @@ -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 diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml index 64faef6c4..61a130580 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml @@ -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 @@ -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: diff --git a/.examples/docker-compose/insecure/postgres/apache/compose.yaml b/.examples/docker-compose/insecure/postgres/apache/compose.yaml index 8ae34013c..12e62c609 100644 --- a/.examples/docker-compose/insecure/postgres/apache/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/apache/compose.yaml @@ -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 diff --git a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml index 8a88afd43..87d8e2926 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml @@ -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 @@ -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: diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml index e1132818d..6e8a9972b 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml @@ -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 diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml index 13d4a40b4..128ccf892 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml @@ -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 @@ -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: @@ -105,7 +106,7 @@ services: depends_on: - proxy -# self signed, outdated. +# self signed, outdated. # omgwtfssl: # image: paulczar/omgwtfssl # restart: "no" diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml index 035359f0b..d5365ca84 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml @@ -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 diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml index 78654edde..1a632966e 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml @@ -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 diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml index e8b702266..844787c06 100644 --- a/.github/workflows/images.yml +++ b/.github/workflows/images.yml @@ -1,3 +1,4 @@ +--- name: Images on: @@ -5,7 +6,7 @@ on: workflow_run: workflows: ["update.sh"] branches: [master] - types: + types: - completed defaults: diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml index efb8283c1..fd9eb8cd5 100644 --- a/.github/workflows/update-sh.yml +++ b/.github/workflows/update-sh.yml @@ -1,11 +1,12 @@ +--- name: update.sh on: push: branches: - - master + - master schedule: - - cron: '15 18 * * *' + - cron: '15 18 * * *' workflow_dispatch: jobs: @@ -13,17 +14,17 @@ jobs: 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 "workflow@github.com" - 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 "workflow@github.com" + 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