From 80de6a1ebe140e55fb8d11fa4e3a34911d50e98f Mon Sep 17 00:00:00 2001 From: wukko Date: Sun, 9 Apr 2023 11:38:37 +0600 Subject: [PATCH] i don't get it --- Dockerfile | 12 +++++------- src/modules/sub/currentCommit.js | 2 -- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index baabc5b..b306428 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,15 @@ FROM node:18-bullseye-slim WORKDIR /app -COPY package*.json ./ -ARG GIT_COMMIT -ARG GIT_BRANCH + RUN apt-get update RUN apt-get install -y git RUN rm -rf /var/lib/apt/lists/* + +COPY package*.json ./ RUN npm install -RUN echo $GIT_BRANCH -ENV GIT_BRANCH=$GIT_BRANCH -ENV GIT_COMMIT=$GIT_COMMIT + RUN git clone -n https://github.com/wukko/cobalt.git --depth 1 && mv cobalt/.git ./ && rm -rf cobalt + COPY . . EXPOSE 9000 CMD [ "node", "src/cobalt" ] - diff --git a/src/modules/sub/currentCommit.js b/src/modules/sub/currentCommit.js index 7f44c1b..f3c145f 100644 --- a/src/modules/sub/currentCommit.js +++ b/src/modules/sub/currentCommit.js @@ -4,7 +4,6 @@ let commit, commitInfo, branch; export function shortCommit() { if (commit) return commit; - if (process.env.GIT_COMMIT) return process.env.GIT_COMMIT; let c = execSync('git rev-parse --short HEAD').toString().trim(); commit = c; return c @@ -18,7 +17,6 @@ export function getCommitInfo() { } export function getCurrentBranch() { if (branch) return branch; - if (process.env.GIT_BRANCH) return process.env.GIT_BRANCH; let b = execSync('git branch --show-current').toString().trim(); branch = b; return b