From 7ec6b5c69cf3a7ab50bdcda50669c11aebd85450 Mon Sep 17 00:00:00 2001 From: Dean Chi <21262275+deantchi@users.noreply.github.com> Date: Thu, 31 Aug 2023 20:34:21 -0700 Subject: [PATCH] use existin dockerfile --- .github/workflows/ci.yaml | 1 + Dockerfile | 17 ----------------- .../{hord.dockerfile => ordhook.dockerfile} | 0 3 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 Dockerfile rename dockerfiles/components/{hord.dockerfile => ordhook.dockerfile} (100%) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d47e6be..6c633bd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -72,5 +72,6 @@ jobs: context: . tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + file: ./dockerfiles/components/ordhook.dockerfile # Only push if (there's a new release on main branch, or if building a non-main branch) and (Only run on non-PR events or only PRs that aren't from forks) push: ${{ (github.ref != 'refs/heads/master' || steps.semantic.outputs.new_release_version != '') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) }} diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 231b280..0000000 --- a/Dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -FROM rust:bullseye as build - -WORKDIR /src -RUN apt update && apt install -y ca-certificates pkg-config libssl-dev libclang-11-dev -RUN rustup update 1.67.0 && rustup default 1.67.0 -COPY ./components /src/components -WORKDIR /src/components/ordhook-cli -RUN mkdir /out -RUN cargo build --features release --release -RUN cp target/release/ordhook /out - -FROM rust:slim-bullseye -RUN apt update && apt install -y ca-certificates libssl-dev -COPY --from=build /out/ /bin/ -WORKDIR /workspace - -ENTRYPOINT ["ordhook"] diff --git a/dockerfiles/components/hord.dockerfile b/dockerfiles/components/ordhook.dockerfile similarity index 100% rename from dockerfiles/components/hord.dockerfile rename to dockerfiles/components/ordhook.dockerfile