From ed82f61dbb89c0f6f392ad7d922a8797e90542ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Valverd=C3=A9?= Date: Fri, 1 Sep 2023 00:28:17 +0200 Subject: [PATCH] Removed git fetch + rootless Docker image --- Dockerfile | 4 +++- docker-compose.yml | 9 +++++++++ src/index.ts | 5 ++--- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile index f21679a..54e3c78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,4 +10,6 @@ RUN apt update -y && \ COPY ./ ./ RUN bun install --production --frozen-lockfile --no-cache && \ rm -rf ~/.bun -ENTRYPOINT ["bun", "start", "/drone/src"] + +USER bun:bun +CMD ["start", "/drone/src"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..4381d0f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +version: "3" + +services: + drone-better-docker-autotag: + build: + context: "." + dockerfile: "Dockerfile" + volumes: + - ./test-repo/:/drone/src diff --git a/src/index.ts b/src/index.ts index 829b0fb..00f6ec1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,7 +2,7 @@ import { Console, Context, Effect, pipe } from "effect" import simpleGit from "simple-git" import { parseArgv } from "./argv" import { parseEnv } from "./env" -import { SimpleGitService, getGitRef, gitFetch } from "./git" +import { SimpleGitService, getGitRef } from "./git" import { DefaultMatcher, SemVerMatcher, generateDockerTagsFromGitRef } from "./matchers" import { writeDockerTagsFile } from "./tags" @@ -19,8 +19,7 @@ const context = Context.empty().pipe( ) const main = pipe( - gitFetch, - Effect.flatMap(() => getGitRef), + getGitRef, Effect.flatMap(ref => generateDockerTagsFromGitRef(ref, [ new SemVerMatcher,