Update to 1.1.4

Preserve SECRET_KEY across restarts

Closes #2

See merge request !5

CHANGELOG

@@ -13,3 +13,13 @@
 [1.0.0]
 * Update to version 1.1.3
 
+[1.0.1]
+* Update Git to v2.7.4-0ubuntu1.2
+* Fixes critical security issue that allows remote command execution in git
+* https://people.canonical.com/~ubuntu-security/cve/2017/CVE-2017-1000117.html
+
+[1.0.2]
+* Preserve SECRET_KEY across updates and restarts
+
+[1.0.3]
+* Update to version 1.1.4

CloudronManifest.json

@@ -4,7 +4,7 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "addons": {

DESCRIPTION.md

@@ -1,6 +1,6 @@
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab. The initial development have been done on Gogs but we have forked it and named it Gitea. If you want to read more about the reasons why we have done that please read [this](https://blog.gitea.io/2016/12/welcome-to-gitea/) blog post.
 
-This app packages Gitea <upstream>1.1.3</upstream>
+This app packages Gitea <upstream>1.1.4</upstream>
 
 ### Purpose
 

Dockerfile

@@ -1,9 +1,9 @@
 FROM cloudron/base:0.10.0
 
-ENV VERSION 1.1.3
+ENV VERSION 1.1.4
 
 RUN apt-get update && \
-    apt-get install -y openssh-server && \
+    apt-get install -y openssh-server git && \
     rm -rf /etc/ssh_host_* && \
     rm -r /var/cache/apt /var/lib/apt/lists
 

start.sh

@@ -62,6 +62,11 @@ if ! [ -f /app/data/app.ini ]; then
     cp /home/git/app.ini.template /app/data/app.ini
 fi
 
+if [ "$(crudini --get /app/data/app.ini security SECRET_KEY)" == "##SECRET_KEY" ]; then
+    echo "Generating new SECRET_KEY"
+    crudini --set "/app/data/app.ini" security SECRET_KEY $(pwgen -1 -s)
+fi
+
 # merge user config file
 crudini --merge "/run/gitea/app.ini" < "/app/data/app.ini"
 
@@ -87,7 +92,6 @@ crudini --set "/run/gitea/app.ini" mailer USER "${MAIL_SMTP_USERNAME}"
 crudini --set "/run/gitea/app.ini" mailer PASSWD "${MAIL_SMTP_PASSWORD}"
 crudini --set "/run/gitea/app.ini" mailer FROM "${MAIL_FROM}"
 crudini --set "/run/gitea/app.ini" mailer SKIP_VERIFY "true"
-crudini --set "/run/gitea/app.ini" security SECRET_KEY $(pwgen -1 -s)
 crudini --set "/run/gitea/app.ini" security INSTALL_LOCK "true"
 crudini --set "/run/gitea/app.ini" log MODE "console"
 crudini --set "/run/gitea/app.ini" log ROOT_PATH "/run/gitea"