23 Release 3.2.5 - See CHANGELOG.md

tiredofit · May 11, 2022 · ac49d16 · ac49d16
1 parent 5fdcd5b
commit ac49d16
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 26 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
@@ -63,17 +63,17 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -101,7 +101,7 @@ jobs:
           fi
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Prepare
         id: prep
@@ -63,17 +63,17 @@ jobs:
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
         with:
           platforms: all
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -101,7 +101,7 @@ jobs:
           fi
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.2.5 2022-05-11 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Tidying up some variables and removing old functions unnecessary
+
+
 ## 3.2.4 2022-05-06 <dave at tiredofit dot ca>
 
    ### Added

diff --git a/install/etc/cont-init.d/30-nextcloud b/install/etc/cont-init.d/30-nextcloud
@@ -148,20 +148,18 @@ mkdir -p "${TEMP_DIRECTORY}"
 chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${TEMP_DIRECTORY}"
 
 ### Database Check
-case "$DB_TYPE" in
-    "mysql" | "mariadb" | "MYSQL" | "MARIADB" )
+case "${DB_TYPE,,}" in
+    "mysql" | "mariadb" )
         DB_PORT=${DB_PORT:-3306}
-
         sanity_db mariadb
         db_ready mariadb
-
         install_options="--database=mysql --database-host=${DB_HOST} --database-name=${DB_NAME} --database-user=${DB_USER} --database-pass=${DB_PASS} --database-table-space=${DB_PREFIX} --database-port=${DB_PORT}"
      ;;
-    "sqlite" | "SQLITE" | "sqlite3" | "SQLITE3" )
+    sqlite* )
         DB_TYPE="sqlite3"
         install_options="--database-name $SQLITE_DATABASE"
      ;;
-    "postgres" | "postgresql" | "POSTGRES" | "POSTGRESQL" )
+    postgres* )
         DB_PORT=${DB_PORT:-5432}
         sanity_db
         db_ready postgres
@@ -173,17 +171,11 @@ case "$DB_TYPE" in
      ;;
 esac
 
-### Sudo Hack for entering inside the container
-echo "alias occ='sudo -u ${NGINX_USER} php ${NGINX_WEBROOT}/occ'" > /root/.bashrc
-
-mkdir -p "${NGINX_WEBROOT}"
-chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}"
-
 installed_version="0.0.0~unknown"
-
+mkdir -p "${NGINX_WEBROOT}"
 rsync -a --delete --exclude /config/ --exclude /data/ --exclude /custom-apps/ --exclude /themes/ /assets/nextcloud/ "${NGINX_WEBROOT}"/
 mkdir -p "${NGINX_WEBROOT}"/data "${NGINX_WEBROOT}"/config "${NGINX_WEBROOT}"/themes "${NGINX_WEBROOT}"/custom-apps
-chown -R nginx "${NGINX_WEBROOT}"
+chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}"
 
 for dir in config themes; do
     if directory_empty "${NGINX_WEBROOT}"/"$dir"; then
@@ -209,7 +201,7 @@ if version_greater "$installed_version" "${NEXTCLOUD_VERSION}"; then
     exit 1
 fi
 
-if [ "$ENABLE_AUTO_UPGRADE" = "TRUE" ]; then
+if var_true "${ENABLE_AUTO_UPGRADE}" ; then
   if version_greater "${NEXTCLOUD_VERSION}" "$installed_version"; then
       if [ "$installed_version" != "0.0.0~unknown" ]; then
         silent sudo -u "${NGINX_USER}" php "${NGINX_WEBROOT}"/occ app:list > /tmp/list_before

diff --git a/install/etc/services.available/30-nextcloud/run b/install/etc/services.available/30-nextcloud/run
@@ -16,4 +16,4 @@ case "$apkArch" in
 esac
 
 print_start "Starting Nextcloud High Performance Files Backend"
-sudo -u nginx /opt/nextcloud_files_backend/bin/${FBArch}/notify_push --port ${FILES_BACKEND_PORT} /www/nextcloud/config/config.php
+sudo -u ${NGINX_USER} /opt/nextcloud_files_backend/bin/${FBArch}/notify_push --port ${FILES_BACKEND_PORT} /www/nextcloud/config/config.php