diff options
| -rw-r--r-- | .packager/.godir (renamed from packager/.godir) | 0 | ||||
| -rw-r--r-- | .packager/Procfile (renamed from packager/Procfile) | 0 | ||||
| -rwxr-xr-x | .packager/hooks/postinst (renamed from packager/hooks/postinst) | 4 | ||||
| -rw-r--r-- | .pkgr.yml | 14 | ||||
| -rw-r--r-- | go.mod | 2 |
5 files changed, 9 insertions, 11 deletions
diff --git a/packager/.godir b/.packager/.godir index ba2906d0..ba2906d0 100644 --- a/packager/.godir +++ b/.packager/.godir diff --git a/packager/Procfile b/.packager/Procfile index ee1a0f55..ee1a0f55 100644 --- a/packager/Procfile +++ b/.packager/Procfile diff --git a/packager/hooks/postinst b/.packager/hooks/postinst index 561080ef..efae87ad 100755 --- a/packager/hooks/postinst +++ b/.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} @@ -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 @@ -67,3 +67,5 @@ require ( xorm.io/core v0.7.2 xorm.io/xorm v0.8.0 ) + +// +heroku goVersion go1.13.3 |