diff options
| -rw-r--r-- | Dockerfile | 14 | ||||
| -rw-r--r-- | model/package.json | 3 | ||||
| -rw-r--r-- | package-lock.json | 7 | ||||
| -rw-r--r-- | packpub/npm/Dockerfile | 10 | ||||
| -rw-r--r-- | packpub/npm/publish.sh | 3 | ||||
| -rw-r--r-- | worker/package.json | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | worker/scripts/coolify_webhook.ts | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | worker/scripts/npm_publish.ts | 0 |
8 files changed, 22 insertions, 17 deletions
@@ -3,7 +3,8 @@ FROM debian:trixie-slim AS laminar_bin ENV DEBIAN_FRONTEND=noninteractive RUN rm -rf /etc/cron.d/e2scrub_all -RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \ +RUN apt-get update -qq > /dev/null && \ + apt-get install -qq --no-install-recommends \ build-essential \ capnproto \ cmake \ @@ -16,10 +17,10 @@ RUN apt-get update -yqq && apt-get install -yqq --no-install-recommends \ ninja-build \ pkg-config \ rapidjson-dev \ - zlib1g-dev + zlib1g-dev > /dev/null RUN mkdir /opt/laminar -RUN git clone https://github.com/ohwgiles/laminar /opt/laminar/src +RUN git clone -q https://github.com/ohwgiles/laminar /opt/laminar/src RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr && \ @@ -30,8 +31,9 @@ RUN cmake -B /opt/laminar/build -S /opt/laminar/src -G Ninja \ # -- <ci_base> -- FROM node:24-trixie-slim AS ci_base -RUN apt-get update -yqq && apt-get install -yqq libcapnp-1.1.0 \ - libsqlite3-0 zlib1g curl bash git jq +RUN apt-get update -qq > /dev/null && \ + apt-get install -qq --no-install-recommends \ + libcapnp-1.1.0 libsqlite3-0 zlib1g curl bash git jq > /dev/null COPY --from=laminar_bin /usr/sbin/laminard /usr/sbin/laminard COPY --from=laminar_bin /usr/bin/laminarc /usr/bin/laminarc COPY --from=laminar_bin /usr/share/man/man8/laminard.8.gz /usr/share/man/man8/laminard.8.gz @@ -43,7 +45,7 @@ COPY --from=laminar_bin /usr/share/zsh/site-functions/_laminarc /usr/share/zsh/s WORKDIR /app COPY . /app -RUN npm ci +RUN npm ci --quiet RUN npm run build ENTRYPOINT [ "/bin/bash", "-c" ] diff --git a/model/package.json b/model/package.json index 7ff6215..b7e1fd6 100644 --- a/model/package.json +++ b/model/package.json @@ -19,6 +19,9 @@ "dependencies": { "@emprespresso/pengueno": "^0.0.13" }, + "devDependencies": { + "typescript": "^5.9.3" + }, "files": [ "dist/**/*", "package.json", diff --git a/package-lock.json b/package-lock.json index d652e41..fe35c42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29,9 +29,12 @@ }, "model": { "name": "@emprespresso/ci_model", - "version": "0.1.0", + "version": "0.2.0", "dependencies": { "@emprespresso/pengueno": "^0.0.13" + }, + "devDependencies": { + "typescript": "^5.9.3" } }, "node_modules/@aws-crypto/crc32": { @@ -4420,7 +4423,7 @@ "name": "@emprespresso/ci_worker", "version": "0.1.0", "dependencies": { - "@emprespresso/ci_model": "*", + "@emprespresso/ci_model": "^0.2.0", "@emprespresso/pengueno": "^0.0.13", "@infisical/sdk": "^4.0.6" }, diff --git a/packpub/npm/Dockerfile b/packpub/npm/Dockerfile index 5fe77af..102320a 100644 --- a/packpub/npm/Dockerfile +++ b/packpub/npm/Dockerfile @@ -1,9 +1,9 @@ FROM debian:stable-slim AS packpub_npm -RUN apt-get update \ - && apt-get -y --no-install-recommends install \ - sudo curl git ca-certificates build-essential \ - && rm -rf /var/lib/apt/lists/* +RUN apt-get update -qq > /dev/null && \ + apt-get install -qq -y --no-install-recommends \ + sudo curl git ca-certificates build-essential > /dev/null && \ + rm -rf /var/lib/apt/lists/* SHELL ["/bin/bash", "-o", "pipefail", "-c"] ENV MISE_DATA_DIR="/mise" @@ -13,7 +13,7 @@ ENV MISE_INSTALL_PATH="/usr/local/bin/mise" ENV PATH="/mise/shims:$PATH" # ENV MISE_VERSION="..." -RUN curl https://mise.run | sh +RUN curl -fsSL https://mise.run | sh COPY publish.sh /publish.sh diff --git a/packpub/npm/publish.sh b/packpub/npm/publish.sh index 065dcdd..9282b68 100644 --- a/packpub/npm/publish.sh +++ b/packpub/npm/publish.sh @@ -10,9 +10,6 @@ NODE_BIN_DIR=$(dirname "$NPM_PATH") export PATH="$NODE_BIN_DIR:$PATH" npm install --save-dev - -export PATH="./node_modules/.bin:$PATH" - npm run build npm link diff --git a/worker/package.json b/worker/package.json index f8eae65..5b7b12f 100644 --- a/worker/package.json +++ b/worker/package.json @@ -17,7 +17,7 @@ "type-check": "tsc --noEmit" }, "dependencies": { - "@emprespresso/ci_model": "*", + "@emprespresso/ci_model": "^0.2.0", "@emprespresso/pengueno": "^0.0.13", "@infisical/sdk": "^4.0.6" }, diff --git a/worker/scripts/coolify_webhook.ts b/worker/scripts/coolify_webhook.ts index d1b4eb0..d1b4eb0 100644..100755 --- a/worker/scripts/coolify_webhook.ts +++ b/worker/scripts/coolify_webhook.ts diff --git a/worker/scripts/npm_publish.ts b/worker/scripts/npm_publish.ts index bcb2796..bcb2796 100644..100755 --- a/worker/scripts/npm_publish.ts +++ b/worker/scripts/npm_publish.ts |