From 78eb9d363fdb6aa2e50809d2b6596bea01ff31b9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Oct 2022 14:35:39 +0300 Subject: [PATCH 1/3] add Jenkinsfile --- Jenkinsfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..b7827eb --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,17 @@ +pipeline { + agent any + + stages { + stage('phpstan') { + steps { + sh """ + docker run --pull=always \ + -v ${env.WORKSPACE}:/src/tt-rss/plugins/plugin \ + --workdir /src/tt-rss \ + --rm cthulhoo/ttrss-fpm-pgsql-static:latest \ + php81 ./vendor/bin/phpstan analyse plugins/plugin + """ + } + } + } +} From fb2eee1edcd2ef57b5aeb290581de096905a14b5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 2 Oct 2022 16:06:21 +0300 Subject: [PATCH 2/3] remove plugin-specific Jenkinsfile --- Jenkinsfile | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index b7827eb..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,17 +0,0 @@ -pipeline { - agent any - - stages { - stage('phpstan') { - steps { - sh """ - docker run --pull=always \ - -v ${env.WORKSPACE}:/src/tt-rss/plugins/plugin \ - --workdir /src/tt-rss \ - --rm cthulhoo/ttrss-fpm-pgsql-static:latest \ - php81 ./vendor/bin/phpstan analyse plugins/plugin - """ - } - } - } -} From 024f7093a0daaf9a95baaffac5d1fbb129d158ea Mon Sep 17 00:00:00 2001 From: jmechnich Date: Tue, 11 Oct 2022 19:19:04 +0200 Subject: [PATCH 3/3] Also call update-ca-certifacates at startup of updater --- app/updater.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/updater.sh b/app/updater.sh index ca7f113..c84b215 100755 --- a/app/updater.sh +++ b/app/updater.sh @@ -20,6 +20,8 @@ if ! id app >/dev/null 2>&1; then echo app:x:$OWNER_UID:$OWNER_GID:Linux User,,,:/var/www/html:/bin/ash | tee -a /etc/passwd fi +update-ca-certificates || true + while ! pg_isready -h $TTRSS_DB_HOST -U $TTRSS_DB_USER; do echo waiting until $TTRSS_DB_HOST is ready... sleep 3