Upgrade to 7.0.0

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
 
+.DS_Store

CHANGELOG.md

@@ -1080,3 +1080,15 @@
 [1.25.1]
 * Trust reverse proxy IP
 
+[1.26.0]
+* Update Gitea to 1.18.0
+* [Full changelog](https://github.com/go-gitea/gitea/releases/tag/v1.18.0)
+* Remove ReverseProxy authentication from the API (#22219) (#22251)
+* Support Go Vulnerability Management (#21139)
+* Forbid HTML string tooltips (#20935)
+* Rework mailer settings (#18982)
+* Remove U2F support (#20141)
+* Refactor i18n to locale (#20153)
+* Enable contenthash in filename for dynamic assets (#20813)
+* And a lot more enhancements
+

CloudronManifest.json

@@ -1,11 +1,11 @@
 {
-  "id": "io.gitea.cloudronapp",
-  "title": "Gitea",
-  "author": "Gitea developers",
+  "id": "org.forgejo.cloudronapp",
+  "title": "Forgejo",
+  "author": "Forgejo developers",
   "description": "file://DESCRIPTION.md",
-  "tagline": "A painless self-hosted Git Service",
-  "version": "1.25.1",
-  "upstreamVersion": "1.17.4",
+  "tagline": "Beyond coding. We forge.",
+  "version": "1.26.0",
+  "upstreamVersion": "v1.18.2-1",
   "healthCheckPath": "/explore",
   "httpPort": 3000,
   "memoryLimit": 536870912,
@@ -23,17 +23,11 @@
     }
   },
   "manifestVersion": 2,
-  "website": "https://gitea.io",
+  "website": "https://forgejo.org",
   "contactEmail": "apps@cloudron.io",
   "icon": "file://logo.png",
   "optionalSso": true,
-  "mediaLinks": [
-    "https://screenshots.cloudron.io/io.gitea.cloudronapp/1.png",
-    "https://screenshots.cloudron.io/io.gitea.cloudronapp/2.png",
-    "https://screenshots.cloudron.io/io.gitea.cloudronapp/3.png",
-    "https://screenshots.cloudron.io/io.gitea.cloudronapp/4.png",
-    "https://screenshots.cloudron.io/io.gitea.cloudronapp/5.png"
-  ],
+  "mediaLinks": [],
   "tags": [ "version control", "git", "code hosting", "development", "github", "bitbucket", "gitlab" ],
   "changelog": "file://CHANGELOG.md",
   "postInstallMessage": "file://POSTINSTALL.md",

Dockerfile

@@ -19,9 +19,9 @@ WORKDIR /home/git
 # for autosign feature
 ENV GNUPGHOME="/app/data/gnupg"
 
-ARG VERSION=1.17.4
+ARG VERSION=7.0.0
 
-RUN curl -L https://dl.gitea.io/gitea/${VERSION}/gitea-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
+RUN curl -L https://codeberg.org/forgejo/forgejo/releases/download/v${VERSION}/forgejo-${VERSION}-linux-amd64 -o /home/git/gitea/gitea \
     && chmod +x /home/git/gitea/gitea
 
 # setup config paths
@@ -39,4 +39,3 @@ ADD start.sh /home/git/start.sh
 COPY sshd_config /etc/ssh/sshd_config
 
 CMD [ "/home/git/start.sh" ]
-

README.md

@@ -1,15 +1,23 @@
-# Gitea Cloudron App
+# Forgejo Cloudron App
 
-This repository contains the Cloudron app package source for [Gitea](http://gitea.io/).
+This repository contains the Cloudron app package source for [Forgejo](https://forgejo.org/).
 
 ## Installation
 
-[![Install](https://cloudron.io/img/button.svg)](https://cloudron.io/button.html?app=io.gitea.cloudronapp)
-
-or using the [Cloudron command line tooling](https://cloudron.io/references/cli.html)
+Using the [Cloudron command line tooling](https://cloudron.io/references/cli.html)
 
 ```
-cloudron install --appstore-id io.gitea.cloudronapp
+cloudron install --image rafaelcaricio/forgejo-cloudron-app:v7.0.0-1 --app code.caric.io
+```
+
+# Upgrading
+
+Upgrade the `Dockerfile` with the version.
+```
+export VERSION=7.0.0
+docker build --platform linux/amd64 -t "rafaelcaricio/forgejo-cloudron-app:v${VERSION}-1" .
+docker push "rafaelcaricio/forgejo-cloudron-app:v${VERSION}-1"
+cloudron update --image rafaelcaricio/forgejo-cloudron-app:v${VERSION}-1 --app code.caric.io --no-backup
 ```
 
 ## Building
@@ -17,7 +25,7 @@ cloudron install --appstore-id io.gitea.cloudronapp
 The app package can be built using the [Cloudron command line tooling](https://cloudron.io/references/cli.html).
 
 ```
-cd gitea-app
+cd forgejo-app
 
 cloudron build
 cloudron install
@@ -33,4 +41,3 @@ cd gitea-app/test
 npm install
 PATH=$PATH:node_modules/.bin USERNAME=<cloudron username> PASSWORD=<cloudron password> mocha --bail test.js
 ```
-

test/package-lock.json

@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^107.0.3",
+        "chromedriver": "^108.0.0",
         "expect.js": "^0.3.1",
-        "mocha": "^10.1.0",
+        "mocha": "^10.2.0",
         "rimraf": "^3.0.2",
-        "selenium-webdriver": "^4.6.1",
-        "superagent": "^8.0.4"
+        "selenium-webdriver": "^4.7.1",
+        "superagent": "^8.0.6"
       }
     },
     "node_modules/@testim/chrome-version": {
@@ -98,7 +98,7 @@
     "node_modules/asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
@@ -237,9 +237,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "107.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-107.0.3.tgz",
-      "integrity": "sha512-jmzpZgctCRnhYAn0l/NIjP4vYN3L8GFVbterTrRr2Ly3W5rFMb9H8EKGuM5JCViPKSit8FbE718kZTEt3Yvffg==",
+      "version": "108.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-108.0.0.tgz",
+      "integrity": "sha512-/kb0rb0dlC4RfXh2BOT7RV87K6d+It3VV5YXebLzO5a8t2knNffiTE23XPJQCH+l1xmgoW8/sOX/NB9irskvOQ==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.3",
@@ -360,9 +360,9 @@
       }
     },
     "node_modules/dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "dependencies": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -512,30 +512,19 @@
       }
     },
     "node_modules/formidable": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz",
-      "integrity": "sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.1.tgz",
+      "integrity": "sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==",
       "dependencies": {
-        "dezalgo": "1.0.3",
-        "hexoid": "1.0.0",
-        "once": "1.4.0",
-        "qs": "6.9.3"
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0",
+        "qs": "^6.11.0"
       },
       "funding": {
         "url": "https://ko-fi.com/tunnckoCore/commissions"
       }
     },
-    "node_modules/formidable/node_modules/qs": {
-      "version": "6.9.3",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-      "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==",
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -944,9 +933,9 @@
       }
     },
     "node_modules/mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
       "dependencies": {
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
@@ -1205,9 +1194,9 @@
       ]
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.6.1.tgz",
-      "integrity": "sha512-FT8Dw0tbzaTp8YYLuwhaCnve/nw03HKrOJrA3aUmTKmxaIFSP4kT2R5fN3K0RpV5kbR0ZnM4FGVI2vANBvekaA==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
+      "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
       "dependencies": {
         "jszip": "^3.10.0",
         "tmp": "^0.2.1",
@@ -1293,16 +1282,16 @@
       }
     },
     "node_modules/superagent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.4.tgz",
-      "integrity": "sha512-yaQB7YqAHhutt8yU7XIRKXGXtkxKidVuiDJ8FJPBG7JPd7Ckv4X9cOdxVGH5DFsPXodsCrOSzdUi2xL+o9z1qw==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.6.tgz",
+      "integrity": "sha512-HqSe6DSIh3hEn6cJvCkaM1BLi466f1LHi4yubR0tpewlMpk4RUFFy35bKz8SsPBwYfIIJy5eclp+3tCYAuX0bw==",
       "dependencies": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.3",
         "debug": "^4.3.4",
         "fast-safe-stringify": "^2.1.1",
         "form-data": "^4.0.0",
-        "formidable": "^2.0.1",
+        "formidable": "^2.1.1",
         "methods": "^1.1.2",
         "mime": "2.6.0",
         "qs": "^6.11.0",
@@ -1561,7 +1550,7 @@
     "asap": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
     "asynckit": {
       "version": "0.4.0",
@@ -1664,9 +1653,9 @@
       }
     },
     "chromedriver": {
-      "version": "107.0.3",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-107.0.3.tgz",
-      "integrity": "sha512-jmzpZgctCRnhYAn0l/NIjP4vYN3L8GFVbterTrRr2Ly3W5rFMb9H8EKGuM5JCViPKSit8FbE718kZTEt3Yvffg==",
+      "version": "108.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-108.0.0.tgz",
+      "integrity": "sha512-/kb0rb0dlC4RfXh2BOT7RV87K6d+It3VV5YXebLzO5a8t2knNffiTE23XPJQCH+l1xmgoW8/sOX/NB9irskvOQ==",
       "requires": {
         "@testim/chrome-version": "^1.1.3",
         "axios": "^1.1.3",
@@ -1757,9 +1746,9 @@
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "dezalgo": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz",
-      "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
       "requires": {
         "asap": "^2.0.0",
         "wrappy": "1"
@@ -1860,21 +1849,14 @@
       }
     },
     "formidable": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.0.1.tgz",
-      "integrity": "sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-2.1.1.tgz",
+      "integrity": "sha512-0EcS9wCFEzLvfiks7omJ+SiYJAiD+TzK4Pcw1UlUoGnhUxDcMKjt0P7x8wEb0u6OHu8Nb98WG3nxtlF5C7bvUQ==",
       "requires": {
-        "dezalgo": "1.0.3",
-        "hexoid": "1.0.0",
-        "once": "1.4.0",
-        "qs": "6.9.3"
-      },
-      "dependencies": {
-        "qs": {
-          "version": "6.9.3",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz",
-          "integrity": "sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="
-        }
+        "dezalgo": "^1.0.4",
+        "hexoid": "^1.0.0",
+        "once": "^1.4.0",
+        "qs": "^6.11.0"
       }
     },
     "fs.realpath": {
@@ -2172,9 +2154,9 @@
       }
     },
     "mocha": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
-      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.2.0.tgz",
+      "integrity": "sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==",
       "requires": {
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
@@ -2353,9 +2335,9 @@
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
     },
     "selenium-webdriver": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.6.1.tgz",
-      "integrity": "sha512-FT8Dw0tbzaTp8YYLuwhaCnve/nw03HKrOJrA3aUmTKmxaIFSP4kT2R5fN3K0RpV5kbR0ZnM4FGVI2vANBvekaA==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
+      "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
       "requires": {
         "jszip": "^3.10.0",
         "tmp": "^0.2.1",
@@ -2417,16 +2399,16 @@
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig=="
     },
     "superagent": {
-      "version": "8.0.4",
-      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.4.tgz",
-      "integrity": "sha512-yaQB7YqAHhutt8yU7XIRKXGXtkxKidVuiDJ8FJPBG7JPd7Ckv4X9cOdxVGH5DFsPXodsCrOSzdUi2xL+o9z1qw==",
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-8.0.6.tgz",
+      "integrity": "sha512-HqSe6DSIh3hEn6cJvCkaM1BLi466f1LHi4yubR0tpewlMpk4RUFFy35bKz8SsPBwYfIIJy5eclp+3tCYAuX0bw==",
       "requires": {
         "component-emitter": "^1.3.0",
         "cookiejar": "^2.1.3",
         "debug": "^4.3.4",
         "fast-safe-stringify": "^2.1.1",
         "form-data": "^4.0.0",
-        "formidable": "^2.0.1",
+        "formidable": "^2.1.1",
         "methods": "^1.1.2",
         "mime": "2.6.0",
         "qs": "^6.11.0",

test/package.json

@@ -9,11 +9,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^107.0.3",
+    "chromedriver": "^108.0.0",
     "expect.js": "^0.3.1",
-    "mocha": "^10.1.0",
+    "mocha": "^10.2.0",
     "rimraf": "^3.0.2",
-    "selenium-webdriver": "^4.6.1",
-    "superagent": "^8.0.4"
+    "selenium-webdriver": "^4.7.1",
+    "superagent": "^8.0.6"
   }
 }