Browse Source

packager.io: update scripts (#5837)

* Test new buildpack and distro

* Try another buildpack version

* Give another try

* Try another one

* Best effort
Unknwon 5 years ago
parent
commit
de61bb6a35
5 changed files with 9 additions and 11 deletions
  1. 0 0
      .packager/.godir
  2. 0 0
      .packager/Procfile
  3. 2 2
      .packager/hooks/postinst
  4. 5 9
      .pkgr.yml
  5. 2 0
      go.mod

+ 0 - 0
packager/.godir → .packager/.godir


+ 0 - 0
packager/Procfile → .packager/Procfile


+ 2 - 2
packager/hooks/postinst → .packager/hooks/postinst

@@ -9,9 +9,9 @@ APP_GROUP=$(${CLI} config:get APP_GROUP)
 APP_CONFIG="/etc/${APP_NAME}/conf/app.ini"
 
 mkdir -p $(dirname ${APP_CONFIG})
-chown ${APP_USER}.${APP_GROUP} $(dirname ${APP_CONFIG})
+chown "${APP_USER}"."${APP_GROUP}" $(dirname ${APP_CONFIG})
 [ -f ${APP_CONFIG} ] || ${CLI} run cp conf/app.ini ${APP_CONFIG}
-${CLI} config:set USER=${APP_USER}
+${CLI} config:set USER="${APP_USER}"
 sed -i "s|RUN_USER = git|RUN_USER = ${APP_USER}|" ${APP_CONFIG}
 sed -i "s|RUN_MODE = dev|RUN_MODE = prod|" ${APP_CONFIG}
 

+ 5 - 9
.pkgr.yml

@@ -9,6 +9,8 @@ targets:
     <<: *debian
   debian-10:
     <<: *debian
+  debian-11:
+    <<: *debian
   ubuntu-14.04:
     <<: *debian
   ubuntu-16.04:
@@ -18,7 +20,7 @@ targets:
       - mercurial
   ubuntu-18.04:
     <<: *debian
-  centos-6: &el
+  centos-7:
     build_dependencies:
       - pam-devel
       # required for go buildpack
@@ -26,14 +28,8 @@ targets:
     dependencies:
       - pam
       - git
-  centos-7:
-    <<: *el
 before:
-  - mv packager/Procfile .
+  - mv .packager/Procfile .
 after:
   - mv bin/gogs gogs
-after_install: ./packager/hooks/postinst
-# Can be updated after CentOS 6 support is dropped, otherwise fails with
-# `fatal: bad config file line 2 in /home/pkgr/.gitconfig` because of
-# https://github.com/heroku/heroku-buildpack-go/blob/f96ebebfa7605fd3916521e42ab050c81c9b947a/lib/common.sh#L238
-buildpack: https://github.com/heroku/heroku-buildpack-go.git#v76
+after_install: ./.packager/hooks/postinst

+ 2 - 0
go.mod

@@ -67,3 +67,5 @@ require (
 	xorm.io/core v0.7.2
 	xorm.io/xorm v0.8.0
 )
+
+// +heroku goVersion go1.13.3