archive pls

docker/scripts/entrypoint.sh

@@ -27,6 +27,13 @@ applyPatch() {
     fi
 }
 
+postEntrypoint() {
+    if [ -n "$POST" ] && [ -x "./post-entrypoint.sh" ] ; then
+        echo "EXECUTING POSTENTRY"
+        ./post-entrypoint.sh
+    fi
+}
+
 changeDir() {
     if [ -n "$CD" ]
     then
@@ -34,11 +41,15 @@ changeDir() {
     fi
 }
 
-# Clone the git repo
-git clone "$REPO" /home/user/pkg && \
-cd /home/user/pkg && \
+DIR="${WORKSPACE:-/home/user/pkg}"
+
+if [ ! -d "$DIR" ]; then
+    git clone "$REPO" "$DIR" || exit $?
+fi
+cd "$DIR" && \
 checkoutCommit && \
 applyPatch && \
 sudo pacman -Syu --noconfirm --noprogressbar &&\
-makepkg -smf --noconfirm --noprogressbar --skippgpcheck --noarchive
+makepkg -smf --noconfirm --noprogressbar --skippgpcheck && \
+postEntrypoint
 exit $?;

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "archery",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "archery",
-      "version": "0.2.0",
+      "version": "0.2.3",
       "license": "MIT",
       "dependencies": {
         "body-parser": "^2.2.0",
@@ -934,6 +934,7 @@
       "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
       "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "accepts": "^2.0.0",
         "body-parser": "^2.2.0",
@@ -1607,6 +1608,7 @@
       "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
       "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "pg-connection-string": "^2.9.1",
         "pg-pool": "^3.10.1",
@@ -2282,9 +2284,9 @@
       }
     },
     "node_modules/validator": {
-      "version": "13.12.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz",
-      "integrity": "sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==",
+      "version": "13.15.20",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.20.tgz",
+      "integrity": "sha512-KxPOq3V2LmfQPP4eqf3Mq/zrT0Dqp2Vmx2Bn285LwVahLc+CsxOM0crBHczm8ijlcjZ0Q5Xd6LW3z3odTPnlrw==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.10"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "archery",
-  "version": "0.2.0",
+  "version": "0.2.3",
   "description": "Build Arch packages through a web interface",
   "keywords": [
     "docker",

src/DB.ts

@@ -216,6 +216,15 @@ class DB extends Store {
         return user.id;
     }
 
+    public async upsertUser(user: User): Promise<string> {
+        await this.user.upsert({
+            id: user.id,
+            username: user.username,
+            displayName: user.displayName || null
+        });
+        return user.id;
+    }
+
     public async createBuild(repo: string, commit: string, patch: string, distro: string, dependencies: string, author: string, uuid: string): Promise<number> {
         const buildRec = await this.build.create({
             repo,

src/Web.ts

@@ -324,17 +324,15 @@ class Web {
             userInfoURL: openidconf.userinfo_endpoint,
             clientID: options.oidc.clientId,
             clientSecret: options.oidc.clientSecret,
-            callbackURL: `${baseUrl}cb`
+            callbackURL: `${baseUrl}cb`,
+            scope: 'profile'
         }, async (_: string, profile: passport.Profile, cb: OpenIDConnectStrategy.VerifyCallback) => {
             const userObj: User = {
                 id: profile.id,
                 username: profile.username,
                 displayName: profile.displayName
             };
-            const user = await this.db.getUser(profile.id);
-            if (!user) {
-                await this.db.createUser(userObj);
-            }
+            await this.db.upsertUser(userObj);
             return cb(null, userObj);
         });
     }

views/build.ejs

@@ -31,7 +31,7 @@
             <a href="/build?id=<%= build.sqid %>" class="button">Clone</a>
         </div>
         <% } %>
-        <% if (!ended) { %>
+        <% if (!ended && !public) { %>
         <div id="cancelRow">
             <a href="cancel" class="button">Cancel build</a>
         </div>