Fix deploy

.github/workflows/feat-deploy.yml

@@ -42,6 +42,6 @@ jobs:
       - name: Create pull request
         run: |
           gh_pr_up() {
-            gh pr create --draft $* --body "${BODY}" || gh pr edit $* --body "${BODY}"
+            gh pr edit $* --body "${BODY}" || gh pr create --draft $* --body "${BODY}"
           }
           gh_pr_up --base master --title "${BRANCH_NAME}"

Dockerfile

@@ -7,7 +7,7 @@ VOLUME /data
 WORKDIR /usr/src/app
 
 RUN apt-get update
-RUN apt-get install -yq bash git-lfs openssh-client curl unzip socat podman-remote
+RUN apt-get install -yq bash git-lfs openssh-client curl unzip socat podman
 RUN curl -fsSL https://deno.land/install.sh | DENO_INSTALL=/usr/local sh
 
 COPY package.json package-lock.json ./
@@ -31,7 +31,7 @@ WORKDIR "/usr/src/app"
 RUN echo 'export GIT_SSH_COMMAND="ssh -i \$(pwd | sed s/_transform.*//)/.private/id_rsa"' >> /etc/profile
 
 # Git 2.47:
-RUN apk upgrade git --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+#RUN apt upgrade git --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN git config --global --add safe.directory /srv/wikigdrive/*
 
 CMD [ "sh", "-c", "wikigdrive --workdir /data server 3000" ]

src/containers/action/DockerContainer.ts

@@ -1,9 +1,11 @@
+import path from 'node:path';
+import {PassThrough, Writable} from 'node:stream';
+
 import Docker from 'dockerode';
-import path from 'path';
 import tarFs from 'tar-fs';
 import tarStream from 'tar-stream';
-import {PassThrough, Writable} from 'stream';
 import winston from 'winston';
+
 import {OciContainer} from './OciContainer.ts';
 import {BufferWritable} from '../../utils/BufferWritable.ts';
 

src/containers/action/OciContainer.ts

@@ -1,4 +1,4 @@
-import {Writable} from 'stream';
+import {Writable} from 'node:stream';
 
 export interface OciContainer {
   skipMount: boolean;

src/containers/action/PodmanContainer.ts

@@ -1,8 +1,9 @@
+import path from 'node:path';
+import {PassThrough, Writable} from 'node:stream';
+
 import Docker from 'dockerode';
-import path from 'path';
 import tarFs from 'tar-fs';
 import tarStream from 'tar-stream';
-import {PassThrough, Writable} from 'stream';
 import winston from 'winston';
 import {OciContainer} from './OciContainer.ts';
 import {BufferWritable} from '../../utils/BufferWritable.ts';