1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pgadmin_ynh.git synced 2024-09-03 19:56:38 +02:00

Merge pull request #23 from YunoHost-Apps/testing

Testing
This commit is contained in:
Josue-T 2022-10-04 06:18:29 +02:00 committed by GitHub
commit 1eef99673b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 38 additions and 37 deletions

View file

@ -3,14 +3,14 @@ N.B.: This README was automatically generated by https://github.com/YunoHost/app
It shall NOT be edited by hand. It shall NOT be edited by hand.
--> -->
# pgAdmin for YunoHost # pgAdmin4 for YunoHost
[![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) [![Integration level](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Working status](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg)
[![Install pgAdmin with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin) [![Install pgAdmin4 with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin)
*[Lire ce readme en français.](./README_fr.md)* *[Lire ce readme en français.](./README_fr.md)*
> *This package allows you to install pgAdmin quickly and simply on a YunoHost server. > *This package allows you to install pgAdmin4 quickly and simply on a YunoHost server.
If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
## Overview ## Overview
@ -18,13 +18,12 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL.
**Shipped version:** 4-5.7~ynh1 **Shipped version:** 6.14~ynh1
## Screenshots ## Screenshots
![](./doc/screenshots/pgadmin4-welcome-light.png) ![Screenshot of pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png)
## Disclaimers / important information ## Disclaimers / important information
@ -34,20 +33,21 @@ This app actually don't support the SSO and don't support LDAP. After the instal
## Documentation and resources ## Documentation and resources
* Official app website: https://www.pgadmin.org * Official app website: <https://www.pgadmin.org>
* Official admin documentation: https://www.pgadmin.org/docs * Official admin documentation: <https://www.pgadmin.org/docs>
* YunoHost documentation for this app: https://yunohost.org/app_pgadmin * YunoHost documentation for this app: <https://yunohost.org/app_pgadmin>
* Report a bug: https://github.com/YunoHost-Apps/pgadmin_ynh/issues * Report a bug: <https://github.com/YunoHost-Apps/pgadmin_ynh/issues>
## Developer info ## Developer info
Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing). Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing).
To try the testing branch, please proceed like that. To try the testing branch, please proceed like that.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug
or or
sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug
``` ```
**More info regarding app packaging:** https://yunohost.org/packaging_apps **More info regarding app packaging:** <https://yunohost.org/packaging_apps>

View file

@ -1,12 +1,16 @@
# pgAdmin pour YunoHost <!--
N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
It shall NOT be edited by hand.
-->
[![Niveau d'intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg) # pgAdmin4 pour YunoHost
[![Installer pgAdmin avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin)
[![Niveau d'intégration](https://dash.yunohost.org/integration/pgadmin.svg)](https://dash.yunohost.org/appci/app/pgadmin) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/pgadmin.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/pgadmin.maintain.svg)
[![Installer pgAdmin4 avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=pgadmin)
*[Read this readme in english.](./README.md)* *[Read this readme in english.](./README.md)*
*[Lire ce readme en français.](./README_fr.md)*
> *Ce package vous permet d'installer pgAdmin rapidement et simplement sur un serveur YunoHost. > *Ce package vous permet d'installer pgAdmin4 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.* 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
@ -14,13 +18,12 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL. pgAdmin is a feature rich Open Source administration and development platform for PostgreSQL.
**Version incluse :** 4-5.7~ynh1 **Version incluse :** 6.14~ynh1
## Captures d'écran ## Captures d'écran
![](./doc/screenshots/pgadmin4-welcome-light.png) ![Capture d'écran de pgAdmin4](./doc/screenshots/pgadmin4-welcome-light.png)
## Avertissements / informations importantes ## Avertissements / informations importantes
@ -30,20 +33,21 @@ This app actually don't support the SSO and don't support LDAP. After the instal
## Documentations et ressources ## Documentations et ressources
* Site officiel de l'app : https://www.pgadmin.org * Site officiel de l'app : <https://www.pgadmin.org>
* Documentation officielle de l'admin : https://www.pgadmin.org/docs * Documentation officielle de l'admin : <https://www.pgadmin.org/docs>
* Documentation YunoHost pour cette app : https://yunohost.org/app_pgadmin * Documentation YunoHost pour cette app : <https://yunohost.org/app_pgadmin>
* Signaler un bug : https://github.com/YunoHost-Apps/pgadmin_ynh/issues * Signaler un bug : <https://github.com/YunoHost-Apps/pgadmin_ynh/issues>
## Informations pour les développeurs ## Informations pour les développeurs
Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing). Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing).
Pour essayer la branche testing, procédez comme suit. Pour essayer la branche testing, procédez comme suit.
```
``` bash
sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug sudo yunohost app install https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug
ou ou
sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug sudo yunohost app upgrade pgadmin -u https://github.com/YunoHost-Apps/pgadmin_ynh/tree/testing --debug
``` ```
**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps **Plus d'infos sur le packaging d'applications :** <https://yunohost.org/packaging_apps>

View file

@ -12,7 +12,6 @@
setup_private=0 setup_private=0
setup_public=0 setup_public=0
upgrade=1 upgrade=1
# upgrade=1 from_commit=CommitHash
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=0 port_already_use=0
@ -20,3 +19,4 @@
;;; Options ;;; Options
Email= Email=
Notification=none Notification=none
;;; Upgrade options

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.30/pgadmin_4-4.30-stretch-bin1_armv7l.tar.gz SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-4.30/pgadmin_4-4.30-stretch-bin1_armv7l.tar.gz
SOURCE_SUM=bc804655cccc478e48636fabeb03ebc087a1fd76610fed1d80437072cf8d0f7b SOURCE_SUM=95f6ac5b3cd5b1d5a1a46502c51318471eb7d22a3031ce06b0c3b5ad33c622ea
# (Optional) Program to check the integrity (sha256sum, md5sum...) # (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256 # default: sha256
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-5.7/pgadmin_4-5.7-buster-bin1_armv7l.tar.gz SOURCE_URL=https://github.com/Josue-T/pgadmin_python_build/releases/download/v4-6.14/pgadmin_4-6.14-buster-bin1_armv7l.tar.gz
SOURCE_SUM=7cf02ebd462d6c1173d8cf60a306284abc82aec9660b949cf66d0335c54715d0 SOURCE_SUM=84ba3e94a8b79b6bfd90201bd600de33b726f72d5ebd5b3a3cfb5fad3c2def03
# (Optional) Program to check the integrity (sha256sum, md5sum...) # (Optional) Program to check the integrity (sha256sum, md5sum...)
# default: sha256 # default: sha256
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum

View file

@ -1,12 +1,12 @@
{ {
"name": "pgAdmin", "name": "pgAdmin4",
"id": "pgadmin", "id": "pgadmin",
"packaging_format": 1, "packaging_format": 1,
"description": { "description": {
"en": "Manage PostgreSQL databases over the web", "en": "Manage PostgreSQL databases over the web",
"fr": "Application web de gestion des bases de données PostgreSQL" "fr": "Application web de gestion des bases de données PostgreSQL"
}, },
"version": "4-5.7~ynh1", "version": "6.14~ynh1",
"url": "https://www.pgadmin.org", "url": "https://www.pgadmin.org",
"upstream": { "upstream": {
"license": "PostgreSQL", "license": "PostgreSQL",

View file

@ -61,7 +61,7 @@ install_source() {
pip3 install --upgrade pip pip3 install --upgrade pip
pip3 install --upgrade 'Werkzeug<1.0' pip3 install --upgrade 'Werkzeug<1.0'
pip3 install --upgrade 'markupsafe==2.0.1' pip3 install --upgrade 'markupsafe==2.0.1'
pip3 install --upgrade pgadmin$app_main_version==$app_sub_version pip3 install --upgrade pgadmin4==$app_sub_version
set +$u_arg; set +$u_arg;
deactivate deactivate
set -$u_arg; set -$u_arg;

View file

@ -32,7 +32,6 @@ admin_pwd=$YNH_APP_ARG_PASSWORD
db_user="pgadmin" db_user="pgadmin"
db_pwd=$(ynh_string_random --length 30) db_pwd=$(ynh_string_random --length 30)
app_version=$(ynh_app_upstream_version) app_version=$(ynh_app_upstream_version)
app_main_version=$(echo $app_version | cut -d'-' -f1)
app_sub_version=$(echo $app_version | cut -d'-' -f2) app_sub_version=$(echo $app_version | cut -d'-' -f2)
app=$YNH_APP_INSTANCE_NAME app=$YNH_APP_INSTANCE_NAME

View file

@ -36,7 +36,6 @@ db_user=$(ynh_app_setting_get --app=$app --key=db_user)
db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd) db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
app_version=$(ynh_app_upstream_version) app_version=$(ynh_app_upstream_version)
app_main_version=$(echo $app_version | cut -d'-' -f1)
app_sub_version=$(echo $app_version | cut -d'-' -f2) app_sub_version=$(echo $app_version | cut -d'-' -f2)
pgadmin_user="$app" pgadmin_user="$app"

View file

@ -23,7 +23,6 @@ admin=$(ynh_app_setting_get --app=$app --key=admin)
final_path=$(ynh_app_setting_get --app=$app --key=final_path) final_path=$(ynh_app_setting_get --app=$app --key=final_path)
app_version=$(ynh_app_upstream_version) app_version=$(ynh_app_upstream_version)
app_main_version=$(echo $app_version | cut -d'-' -f1)
app_sub_version=$(echo $app_version | cut -d'-' -f2) app_sub_version=$(echo $app_version | cut -d'-' -f2)
pgadmin_user="$app" pgadmin_user="$app"