diff --git a/.drone.jsonnet b/.drone.jsonnet index 8cda6c4..33b5fdb 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -1,4 +1,4 @@ -local bun_image = "oven/bun:0.8.1"; +local bun_image = "oven/bun:1.0"; local fetch_step = { @@ -7,12 +7,12 @@ local fetch_step = { commands: ["git fetch --tags"], }; -local install_run_step = { - name: "install-run", +local generate_docker_tags_step = { + name: "generate-docker-tags", image: bun_image, commands: [ - "apt update -y && apt full-upgrade -y && apt install -y --reinstall ca-certificates && apt install -y --no-install-recommends git", - "bun install --production --frozen-lockfile --no-cache", + "apt-get update && apt-get install -y --reinstall --no-install-recommends ca-certificates && apt-get install -y --no-install-recommends git", + "bun install --frozen-lockfile --no-cache --production", "bun start .", ], }; @@ -50,7 +50,7 @@ local build_docker_step(publish) = { steps: [ fetch_step, - install_run_step, + generate_docker_tags_step, build_docker_step(false), ], }, @@ -72,7 +72,7 @@ local build_docker_step(publish) = { steps: [ fetch_step, - install_run_step, + generate_docker_tags_step, build_docker_step(true), ], }, diff --git a/Dockerfile b/Dockerfile index 87b8cc9..6557e7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,14 @@ -FROM oven/bun:0.8.1 +FROM oven/bun:1.0 -RUN apt update -y && \ - apt full-upgrade -y && \ - apt install -y --reinstall ca-certificates && \ - apt install -y --no-install-recommends git && \ - apt autoremove -y --purge && \ - apt clean - -COPY ./docker-entrypoint.sh /usr/local/bin +RUN apt-get update && \ + apt-get install -y --reinstall --no-install-recommends ca-certificates && \ + apt-get install -y --no-install-recommends git && \ + apt-get autoremove -y --purge && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* WORKDIR /app COPY ./ ./ -RUN bun install --production --frozen-lockfile --no-cache && \ +RUN bun install --frozen-lockfile --no-cache --production && \ rm -rf ~/.bun +ENTRYPOINT ["bun", "--cwd=/app", "start", "/drone/src"] diff --git a/bun.lockb b/bun.lockb index 7135984..b23f2c5 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100755 index b9b4133..0000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env sh -set -e - -cd /app -exec bun start /drone/src diff --git a/package.json b/package.json index 490bfd8..9442f89 100644 --- a/package.json +++ b/package.json @@ -7,17 +7,17 @@ "start:dev": "NODE_ENV=development bun src/index.ts" }, "devDependencies": { - "@types/lodash-es": "^4.17.8", - "@types/semver": "^7.5.0", - "bun-types": "latest", - "type-fest": "^4.2.0" - }, - "peerDependencies": { - "typescript": "^5.0.0" + "@types/lodash-es": "^4.17.9", + "@types/semver": "^7.5.1", + "bun-types": "^1.0.1", + "npm-check-updates": "^16.13.3", + "npm-sort": "^0.0.4", + "type-fest": "^4.3.1", + "typescript": "^5.2.2" }, "dependencies": { - "@effect/schema": "^0.33.2", - "effect": "^2.0.0-next.29", + "@effect/schema": "^0.35.0", + "effect": "^2.0.0-next.31", "lodash-es": "^4.17.21", "semver": "^7.5.4", "simple-git": "^3.19.1",