From 448da43bf79f94d0b574ab4e7b459c90ebc1df65 Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Sun, 30 Jun 2024 23:59:36 -0400 Subject: [PATCH 1/3] Refresh Dockerfile --- Dockerfile | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 71bba287..77478c7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,29 @@ -FROM python:3.11-slim-bullseye as build -WORKDIR /wheels +# Release instructions: + # 1. Update the version tag in the Dockerfile to match the version in sherlock/__init__.py + # 2. Update the VCS_REF tag to match the tagged version's FULL commit hash + # 3. Build image with BOTH latest and version tags + # i.e. `docker build -t sherlock/sherlock:0.15.0 -t sherlock/sherlock:latest .` + +FROM python:3.12-slim-bullseye as build +WORKDIR /sherlock -COPY requirements.txt /opt/sherlock/ RUN apt-get update \ - && apt-get install -y build-essential \ - && pip3 wheel -r /opt/sherlock/requirements.txt + pip3 install --no-cache-dir --upgrade pip -FROM python:3.11-slim-bullseye -WORKDIR /opt/sherlock +FROM python:3.12-slim-bullseye +WORKDIR /sherlock -ARG VCS_REF +ARG VCS_REF= # CHANGE ME ON UPDATE ARG VCS_URL="https://github.com/sherlock-project/sherlock" +ARG VERSION_TAG= # CHANGE ME ON UPDATE LABEL org.label-schema.vcs-ref=$VCS_REF \ - org.label-schema.vcs-url=$VCS_URL + org.label-schema.vcs-url=$VCS_URL \ + org.label-schema.name="Sherlock" \ + org.label-schema.version=$VERSION_TAG \ + website="https://sherlockproject.xyz" -COPY --from=build /wheels /wheels -COPY . /opt/sherlock/ - -RUN pip3 install --no-cache-dir . -f /wheels \ - && rm -rf /wheels +RUN pip3 install --no-cache-dir sherlock-project==$VERSION_TAG WORKDIR /opt/sherlock/sherlock From 04472af9c09a25a77ee22d448aa38ffa2e1d2f9b Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 1 Jul 2024 00:02:17 -0400 Subject: [PATCH 2/3] Fix workdir --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 77478c7b..cf0fbe71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,6 @@ LABEL org.label-schema.vcs-ref=$VCS_REF \ RUN pip3 install --no-cache-dir sherlock-project==$VERSION_TAG -WORKDIR /opt/sherlock/sherlock +WORKDIR /sherlock ENTRYPOINT ["sherlock"] From bb9dd410daafcb65de96dbdadefbb5b68b36524d Mon Sep 17 00:00:00 2001 From: Paul Pfeister Date: Mon, 8 Jul 2024 01:42:04 -0400 Subject: [PATCH 3/3] SHERLOCK_ENV set --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index cf0fbe71..3b64fc82 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,6 +17,8 @@ ARG VCS_REF= # CHANGE ME ON UPDATE ARG VCS_URL="https://github.com/sherlock-project/sherlock" ARG VERSION_TAG= # CHANGE ME ON UPDATE +ENV SHERLOCK_ENV=docker + LABEL org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-url=$VCS_URL \ org.label-schema.name="Sherlock" \