From f50ab1e673325fe60bfda3148c170617894576c6 Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 2 Jan 2023 13:17:30 +0100 Subject: [PATCH 01/20] Update to RELEASE.2022-12-12T19-27-27Z and automated update workflow --- .github/workflows/updater.sh | 136 ++++++++++++++++++++++++++++++++++ .github/workflows/updater.yml | 50 +++++++++++++ conf/amd64.src | 4 +- conf/arm64.src | 4 +- conf/mc_amd64.src | 4 +- conf/mc_arm64.src | 4 +- manifest.json | 4 +- 7 files changed, 196 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/updater.sh create mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..be32617 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,136 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. + +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +mc_version=$(curl --silent "https://api.github.com/repos/minio/mc/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) + +# Later down the script, we assume the version has only digits and dots +# Sometimes the release name starts with a "v", so let's filter it out. +# You may need more tweaks here if the upstream repository has different naming conventions. +if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then + version=${version:1} +fi + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if [[ ! "$version" > "$current_version" ]] ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. + +# Let's loop over the array of assets URLs +for src in mc_amd64 mc_arm64 amd64 arm64; do + +case $src in + "amd64") + asset_url="https://dl.min.io/server/minio/release/linux-amd64/archive/minio.$version" + src_filename=minio + ;; + "arm64") + asset_url="https://dl.min.io/server/minio/release/linux-arm64/archive/minio.$version" + src_filename=minio + ;; + "mc_amd64") + asset_url="https://dl.min.io/client/mc/release/linux-arm64/archive/mc.$mc_version" + src_filename=mc + ;; + "mc_arm64") + asset_url="https://dl.min.io/client/mc/release/linux-arm64/archive/mc.$mc_version" + src_filename=mc + ;; +esac + +echo "Handling asset at $asset_url" + + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# Create the temporary directory +tempdir="$(mktemp -d)" + +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# Rewrite source file +cat < conf/$src.src +SOURCE_URL=$asset_url +SOURCE_SUM=$checksum +SOURCE_SUM_PRG=sha256sum +SOURCE_IN_SUBDIR=false +SOURCE_FILENAME=$src_filename +SOURCE_EXTRACT=false +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +done + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml new file mode 100644 index 0000000..5b11796 --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,50 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. +name: Check for new upstream releases +on: + # Allow to manually trigger the workflow + workflow_dispatch: + # Run it at 6:00 UTC every 1st or 15th of the month + schedule: + - cron: '0 6 1,15 * *' +jobs: + updater: + runs-on: ubuntu-latest + steps: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - name: Run the updater script + id: run_updater + run: | + # Setting up Git user + git config --global user.name 'yunohost-bot' + git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | + git commit -am "Upgrade to v$VERSION" + - name: Create Pull Request + id: cpr + if: ${{ env.PROCEED == 'true' }} + uses: peter-evans/create-pull-request@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + base: testing + branch: ci-auto-update-v${{ env.VERSION }} + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + draft: false + diff --git a/conf/amd64.src b/conf/amd64.src index cbe01d1..6c2043f 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2022-11-11T03-44-20Z -SOURCE_SUM=990f0ef0dcccff1210c6e97584279926f6a16e35a0d91d2802046052a9d356e2 +SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2022-12-12T19-27-27Z +SOURCE_SUM=cbb59260d85bb409467aebcb332053ebc0ad3dcea1e3385565851d32256baf44 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=minio diff --git a/conf/arm64.src b/conf/arm64.src index c48f40f..e96249a 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2022-11-11T03-44-20Z -SOURCE_SUM=625e4f543b2c33e44d3f4467a129af39be91cb51de94b42d55a01f8723a5d806 +SOURCE_URL=https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2022-12-12T19-27-27Z +SOURCE_SUM=cd8b3b1a09cf2624a8ec7dc64cacbb6c4fd1254134e52081753d319c41390aa0 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=minio diff --git a/conf/mc_amd64.src b/conf/mc_amd64.src index 38bcf76..2687e11 100644 --- a/conf/mc_amd64.src +++ b/conf/mc_amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-11-07T23-47-39Z -SOURCE_SUM=85ad97a2ceea6b54fc856293bffe964f56c362b747b5b9d07cccfaae5c746ffa +SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-12-13T00-23-28Z +SOURCE_SUM=d2bc38c5173900b88eb61f4adabdf13b72aabd25d920369e5d1b48ccd6fcf6aa SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc diff --git a/conf/mc_arm64.src b/conf/mc_arm64.src index 4e12520..2687e11 100644 --- a/conf/mc_arm64.src +++ b/conf/mc_arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-11-07T23-47-39Z -SOURCE_SUM=2e53b27e0efbfceda6a1b5e85862ea4355fae101246e152cc6f3c0a45a371ab2 +SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-12-13T00-23-28Z +SOURCE_SUM=d2bc38c5173900b88eb61f4adabdf13b72aabd25d920369e5d1b48ccd6fcf6aa SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc diff --git a/manifest.json b/manifest.json index 5d45869..9860208 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "High Performance, Kubernetes Native Object Storage", "fr": "Serveur de stockage d'objets hautes performances" }, - "version": "2022.11.11~ynh1", + "version": "RELEASE.2022-12-12T19-27-27Z~ynh1", "url": "https://min.io/", "upstream": { "license": "AGPL-3.0-only", @@ -47,4 +47,4 @@ } ] } -} \ No newline at end of file +} From 4795433de28133f04fe367808b86dce612a473b2 Mon Sep 17 00:00:00 2001 From: Florent Date: Tue, 3 Jan 2023 14:35:43 +0100 Subject: [PATCH 02/20] Add --no-color to prevent error while logging --- scripts/install | 2 +- scripts/upgrade | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 65739c5..0f618ce 100755 --- a/scripts/install +++ b/scripts/install @@ -187,7 +187,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc alias set minio "http://127.0.0.1:$port" "$admin" "$password" --api S3v4 + ynh_exec_warn_less sudo -u $app ./mc --no-color alias set minio "http://127.0.0.1:$port" "$admin" "$password" --api S3v4 popd #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index a620f00..1feba54 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -153,7 +153,7 @@ ynh_systemd_action --service_name=nginx --action=reload ynh_script_progression --message="Configuring MinIO client..." --weight=1 pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc alias set minio "https://$domain" "$admin" "$password" --api S3v4 + ynh_exec_warn_less sudo -u $app ./mc --no-color alias set minio "https://$domain" "$admin" "$password" --api S3v4 popd #================================================= From 14197cc39673e6877ae87c864bb49a5e44ddcdff Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 3 Jan 2023 23:03:08 +0100 Subject: [PATCH 03/20] Fix auto-updater --- .github/workflows/updater.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index be32617..c938f96 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -65,7 +65,7 @@ case $src in src_filename=minio ;; "mc_amd64") - asset_url="https://dl.min.io/client/mc/release/linux-arm64/archive/mc.$mc_version" + asset_url="https://dl.min.io/client/mc/release/linux-amd64/archive/mc.$mc_version" src_filename=mc ;; "mc_arm64") @@ -127,6 +127,7 @@ done #================================================= # Replace new version in manifest +version=$(sed -E "s/RELEASE\.([0-9-]+)T.+/\1/g" <<< $version | sed -E "s/-/./g") echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json # No need to update the README, yunohost-bot takes care of it From 387cc517bb2d721dce3d2fa7141071db4fa4bef8 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 3 Jan 2023 23:03:45 +0100 Subject: [PATCH 04/20] Fix typos induced by auto-updater --- conf/mc_amd64.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/mc_amd64.src b/conf/mc_amd64.src index 2687e11..53077a3 100644 --- a/conf/mc_amd64.src +++ b/conf/mc_amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-12-13T00-23-28Z -SOURCE_SUM=d2bc38c5173900b88eb61f4adabdf13b72aabd25d920369e5d1b48ccd6fcf6aa +SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-12-13T00-23-28Z +SOURCE_SUM=47069f02014eb666680720cc7982d0fcbe96b4878abfd0139b0f0cb39b529874 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc diff --git a/manifest.json b/manifest.json index 9860208..3b4a8aa 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "High Performance, Kubernetes Native Object Storage", "fr": "Serveur de stockage d'objets hautes performances" }, - "version": "RELEASE.2022-12-12T19-27-27Z~ynh1", + "version": "2022.12.12~ynh1", "url": "https://min.io/", "upstream": { "license": "AGPL-3.0-only", From 8fddb4b5703099fef30a22e9a01a80e10081bf2d Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 00:55:19 +0700 Subject: [PATCH 05/20] Update upgrade --- scripts/upgrade | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 1feba54..5ecc164 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,6 +49,18 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." + +if ["yunohost app info minio | grep -oEi [0-9]{4}" == "2022"] +then + ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" +else + ynh_script_progression --message="No migration required" +fi + #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -58,11 +70,6 @@ ynh_script_progression --message="Stopping a systemd service..." --weight=2 ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - #================================================= # CREATE DEDICATED USER #================================================= From bfee36ccde5ac612ab60e4ce86a636dd9b55a862 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 01:07:03 +0700 Subject: [PATCH 06/20] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5ecc164..ca5a603 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -54,7 +54,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -if ["yunohost app info minio | grep -oEi [0-9]{4}" == "2022"] +if [$(yunohost app info minio | grep -oEi [0-9]{4}) == "2022"] then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" else From c6a0d68a57d0dfa52673b63e32f77f314eaa32db Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 01:08:16 +0700 Subject: [PATCH 07/20] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ca5a603..4ad812b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -54,7 +54,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -if [$(yunohost app info minio | grep -oEi [0-9]{4}) == "2022"] +if [ "$(yunohost app info minio | grep -oEi [0-9]{4})" == "2022" ] then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" else From 1fcd9ec64dcaf9cd4a7572d296edc3cd456185f7 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 01:27:40 +0700 Subject: [PATCH 08/20] First try for migration --- scripts/upgrade | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4ad812b..23e135f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -49,18 +49,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -ynh_script_progression --message="Ensuring downward compatibility..." - -if [ "$(yunohost app info minio | grep -oEi [0-9]{4})" == "2022" ] -then - ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" -else - ynh_script_progression --message="No migration required" -fi - #================================================= # STANDARD UPGRADE STEPS #================================================= @@ -163,6 +151,27 @@ pushd $mc_path ynh_exec_warn_less sudo -u $app ./mc --no-color alias set minio "https://$domain" "$admin" "$password" --api S3v4 popd +#================================================= +# ENSURE DOWNWARD COMPATIBILITY +#================================================= +ynh_script_progression --message="Ensuring downward compatibility..." + +if [ "$(yunohost app info minio | grep -oEi [0-9]{4})" == "2022" ] +then + ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" + for d in * ; do + ynh_script_progression --message="Migrating bucket $d" + mv "$d" "DATA_$d" + mkdir "$d" + chmod 750 "$d" + chmod -R o-rwx "$d" + chown -R $app:www-data "$d" + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve --watch "DATA_$d" minio/"$d" + done +else + ynh_script_progression --message="No migration required" +fi + #================================================= # END OF SCRIPT #================================================= From e1d23df8d01670c1ac7079a3453a84aaf69bbe56 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 01:31:44 +0700 Subject: [PATCH 09/20] Second try --- scripts/upgrade | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 23e135f..a95e07f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -159,15 +159,19 @@ ynh_script_progression --message="Ensuring downward compatibility..." if [ "$(yunohost app info minio | grep -oEi [0-9]{4})" == "2022" ] then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" - for d in * ; do - ynh_script_progression --message="Migrating bucket $d" - mv "$d" "DATA_$d" - mkdir "$d" - chmod 750 "$d" - chmod -R o-rwx "$d" - chown -R $app:www-data "$d" - ynh_exec_warn_less sudo -u $app ./mc mirror --preserve --watch "DATA_$d" minio/"$d" - done + pushd $datadir + for d in * ; do + ynh_script_progression --message="Migrating bucket $d" + mv "$d" "DATA_$d" + mkdir "$d" + chmod 750 "$d" + chmod -R o-rwx "$d" + chown -R $app:www-data "$d" + pushd $mc_path + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve --watch "$datadir/DATA_$d" minio/"$d" + popd + done + popd else ynh_script_progression --message="No migration required" fi From 0b1d6c416bb8d6020d1e5b55a55d2bb24bfc34b2 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 01:41:11 +0700 Subject: [PATCH 10/20] Update upgrade --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index a95e07f..f8bebf2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -168,8 +168,9 @@ then chmod -R o-rwx "$d" chown -R $app:www-data "$d" pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc mirror --preserve --watch "$datadir/DATA_$d" minio/"$d" + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir/DATA_$d" minio/"$d" popd + ynh_secure_remove --file="DATA_$d" done popd else From 960cde44ca54d0567eff0e5ae7a5b50a43f4d510 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 01:46:52 +0700 Subject: [PATCH 11/20] Update upgrade --- scripts/upgrade | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index f8bebf2..fab726b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -163,11 +163,8 @@ then for d in * ; do ynh_script_progression --message="Migrating bucket $d" mv "$d" "DATA_$d" - mkdir "$d" - chmod 750 "$d" - chmod -R o-rwx "$d" - chown -R $app:www-data "$d" pushd $mc_path + ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir/DATA_$d" minio/"$d" popd ynh_secure_remove --file="DATA_$d" From e6dd76337e2b2aea9d16067778e62ab854cc48ab Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:01:04 +0700 Subject: [PATCH 12/20] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index fab726b..92661d5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -156,7 +156,7 @@ popd #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -if [ "$(yunohost app info minio | grep -oEi [0-9]{4})" == "2022" ] +if ynh_compare_current_package_version --comparison lt --version 2022.12.12~ynh1 then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" pushd $datadir From 78d39ef33eff052bdc33e238e973f510b7fd854f Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:09:04 +0700 Subject: [PATCH 13/20] Upgrade to 2023.01.11~ynh1 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/mc_amd64.src | 2 +- conf/mc_arm64.src | 4 ++-- manifest.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 6c2043f..d126eba 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2022-12-12T19-27-27Z -SOURCE_SUM=cbb59260d85bb409467aebcb332053ebc0ad3dcea1e3385565851d32256baf44 +SOURCE_URL=https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2023-01-25T00-19-54Z +SOURCE_SUM=e7d44bb2f808d9ada43c7b1a677b3ae8e336f5be442992cd35a1b89e545c76d5 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=minio diff --git a/conf/arm64.src b/conf/arm64.src index e96249a..6e613a6 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2022-12-12T19-27-27Z -SOURCE_SUM=cd8b3b1a09cf2624a8ec7dc64cacbb6c4fd1254134e52081753d319c41390aa0 +SOURCE_URL=https://dl.min.io/server/minio/release/linux-arm64/archive/minio.RELEASE.2023-01-25T00-19-54Z +SOURCE_SUM=a927c48815c1f077dd8228734275a521c2299de1aa28bc8972585e3addd59c3f SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=minio diff --git a/conf/mc_amd64.src b/conf/mc_amd64.src index 53077a3..3e1131a 100644 --- a/conf/mc_amd64.src +++ b/conf/mc_amd64.src @@ -1,4 +1,4 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-12-13T00-23-28Z +SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2023-01-11T03-14-16Z SOURCE_SUM=47069f02014eb666680720cc7982d0fcbe96b4878abfd0139b0f0cb39b529874 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false diff --git a/conf/mc_arm64.src b/conf/mc_arm64.src index 2687e11..f596424 100644 --- a/conf/mc_arm64.src +++ b/conf/mc_arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-12-13T00-23-28Z -SOURCE_SUM=d2bc38c5173900b88eb61f4adabdf13b72aabd25d920369e5d1b48ccd6fcf6aa +SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2023-01-11T03-14-16Z +SOURCE_SUM=9f7eed268bde082e2dbf382569f97c493de392250830a95f87ecd36411d4d77c SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc diff --git a/manifest.json b/manifest.json index 3b4a8aa..a287fb5 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "High Performance, Kubernetes Native Object Storage", "fr": "Serveur de stockage d'objets hautes performances" }, - "version": "2022.12.12~ynh1", + "version": "2023.01.11~ynh1", "url": "https://min.io/", "upstream": { "license": "AGPL-3.0-only", From 4a7457e5c43349c3b0c6ad04e4ada88ce385eb44 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:27:42 +0700 Subject: [PATCH 14/20] Update mc --- conf/mc_amd64.src | 4 ++-- conf/mc_arm64.src | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/mc_amd64.src b/conf/mc_amd64.src index 3e1131a..904ef69 100644 --- a/conf/mc_amd64.src +++ b/conf/mc_amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2023-01-11T03-14-16Z -SOURCE_SUM=47069f02014eb666680720cc7982d0fcbe96b4878abfd0139b0f0cb39b529874 +SOURCE_URL=https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2022-12-24T15-21-38Z +SOURCE_SUM=8274f56d3ca69b2538fd818ff53a793c2fe1fc568489d97ee74d463123536aa6 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc diff --git a/conf/mc_arm64.src b/conf/mc_arm64.src index f596424..ac46f4e 100644 --- a/conf/mc_arm64.src +++ b/conf/mc_arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2023-01-11T03-14-16Z -SOURCE_SUM=9f7eed268bde082e2dbf382569f97c493de392250830a95f87ecd36411d4d77c +SOURCE_URL=https://dl.min.io/client/mc/release/linux-arm64/archive/mc.RELEASE.2022-12-24T15-21-38Z +SOURCE_SUM=5a29fb81e9a7d75b0afca9fbccfca6eba6c54e7dcefbe8b0ac662bc7a70e089a SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mc From e8f026db2920f8293c20d56f81895c7805002d65 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:43:48 +0700 Subject: [PATCH 15/20] Complotist theory : Minio is delibarately making it difficult --- conf/nginx.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 6dac43f..d699684 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -1,9 +1,10 @@ rewrite ^$ /; -location ~ ^(/api|/images|/Loader.svg|/apple-icon-180x180.png|/favicon-96x96.png|/favicon-16x16.png|/favicon-32x32.png|/login|/styles|/static|/manifest.json|/$) { +location ~ ^(/ws|/api|/images|/Loader.svg|/apple-icon-180x180.png|/favicon-96x96.png|/favicon-16x16.png|/favicon-32x32.png|/login|/styles|/static|/manifest.json|/$) { proxy_pass http://127.0.0.1:__CONSOLE_PORT__; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; proxy_cache_bypass $http_upgrade; proxy_ignore_client_abort on; client_max_body_size 200M; From d979d7c8872c1ddea6b9a0629f498b8160f11d87 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:48:23 +0700 Subject: [PATCH 16/20] Hack for Outline users --- scripts/upgrade | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index 92661d5..f1e1c41 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -166,6 +166,11 @@ then pushd $mc_path ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir/DATA_$d" minio/"$d" + # This is a hack, but it will make outline_ynh users' lifes much easier ! + if [ "$d" == "outlinestorage" ] + then + ynh_exec_warn_less sudo -u $app ./mc policy set public minio/outlinestorage + fi popd ynh_secure_remove --file="DATA_$d" done From fdb5e3973ec5b4ea013d1178753991702bf85482 Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:53:10 +0700 Subject: [PATCH 17/20] Warning after migration --- scripts/upgrade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/upgrade b/scripts/upgrade index f1e1c41..793f552 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -170,6 +170,8 @@ then if [ "$d" == "outlinestorage" ] then ynh_exec_warn_less sudo -u $app ./mc policy set public minio/outlinestorage + else + ynh_script_progression --message="Bucket is migrated and objects are now mirrored. However, make sure to set properly access policy of bucket $d. That part of the migration can't be automated, sorry ! You can log into the minio console to perform your changes." fi popd ynh_secure_remove --file="DATA_$d" From 67eee565d1ac17b2907ebeed4cbab71f798a899e Mon Sep 17 00:00:00 2001 From: Limezy Date: Fri, 27 Jan 2023 22:59:56 +0700 Subject: [PATCH 18/20] Check update from older version --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index 565f9f1..fa8fdb1 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,7 @@ setup_private=1 setup_public=1 upgrade=1 - #upgrade=1 from_commit=CommitHash + upgrade=1 from_commit=1ef6a65e00dbb39dac8919cf6c5f4313fea8462e backup_restore=1 multi_instance=0 port_already_use=0 From 19962cea4b5b801cd06057852293f050abded2dc Mon Sep 17 00:00:00 2001 From: Limezy Date: Sat, 28 Jan 2023 14:22:34 +0700 Subject: [PATCH 19/20] Prevent mistake if no buckets to migrate --- scripts/upgrade | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 793f552..d3027c7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -161,20 +161,25 @@ then ynh_script_progression --message="Migration from Filesystem to Single-Node Single-Drive mode" pushd $datadir for d in * ; do - ynh_script_progression --message="Migrating bucket $d" - mv "$d" "DATA_$d" - pushd $mc_path - ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" - ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir/DATA_$d" minio/"$d" - # This is a hack, but it will make outline_ynh users' lifes much easier ! - if [ "$d" == "outlinestorage" ] - then - ynh_exec_warn_less sudo -u $app ./mc policy set public minio/outlinestorage - else - ynh_script_progression --message="Bucket is migrated and objects are now mirrored. However, make sure to set properly access policy of bucket $d. That part of the migration can't be automated, sorry ! You can log into the minio console to perform your changes." - fi - popd - ynh_secure_remove --file="DATA_$d" + if [ "$d" == "*" ] + then + ynh_script_progression --message="No buckets to migrate" + else + ynh_script_progression --message="Migrating bucket $d" + mv "$d" "DATA_$d" + pushd $mc_path + ynh_exec_warn_less sudo -u $app ./mc mb minio/"$d" + ynh_exec_warn_less sudo -u $app ./mc mirror --preserve "$datadir/DATA_$d" minio/"$d" + # This is a hack, but it will make outline_ynh users' lifes much easier ! + if [ "$d" == "outlinestorage" ] + then + ynh_exec_warn_less sudo -u $app ./mc policy set public minio/outlinestorage + else + ynh_script_progression --message="Bucket is migrated and objects are now mirrored. However, make sure to set properly access policy of bucket $d. That part of the migration can't be automated, sorry ! You can log into the minio console to perform your changes." + fi + popd + ynh_secure_remove --file="DATA_$d" + fi done popd else From 7c4b21792b30e37029566f2dd89b640ec4673dad Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 Jan 2023 02:37:52 +0000 Subject: [PATCH 20/20] Auto-update README --- README.md | 4 ++-- README_fr.md | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 666e5fc..872b651 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # MinIO server for YunoHost -[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) ![Working status](https://ci-apps.yunohost.org/ci/badges/minio.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/minio.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) ![Working status](https://ci-apps.yunohost.org/ci/badges/minio.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/minio.maintain.svg) [![Install MinIO server with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=minio) *[Lire ce readme en français.](./README_fr.md)* @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in MinIO is a High Performance Object Storage released under GNU Affero General Public License v3.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. -**Shipped version:** 2022.11.11~ynh1 +**Shipped version:** 2023.01.11~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 1d43fc6..1cb7f3e 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,24 +5,24 @@ It shall NOT be edited by hand. # MinIO server pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/minio.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/minio.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/minio.svg)](https://dash.yunohost.org/appci/app/minio) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/minio.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/minio.maintain.svg) [![Installer MinIO server avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=minio) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer MinIO server rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer MinIO server rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble MinIO is a High Performance Object Storage released under GNU Affero General Public License v3.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. -**Version incluse :** 2022.11.11~ynh1 +**Version incluse :** 2023.01.11~ynh1 -## Captures d'écran +## Captures d’écran -![Capture d'écran de MinIO server](./doc/screenshots/minio-browser.png) +![Capture d’écran de MinIO server](./doc/screenshots/minio-browser.png) ## Avertissements / informations importantes @@ -55,9 +55,9 @@ popd ``` ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -73,4 +73,4 @@ ou sudo yunohost app upgrade minio -u https://github.com/YunoHost-Apps/minio_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file