Skip to content

Commit fab7158

Browse files
authored
build: change release to semgrep from pypi instead of semgrep bfs (#1125)
The final docker image now uses pip install for Semgrep instead of pulling from the dependencies artifact.
1 parent 8b15870 commit fab7158

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

docker/Dockerfile.final

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
# Note that the local machine must login to ghcr.io so that Docker could pull the ghcr.io/oracle/macaron-base
1212
# image for this build.
1313

14-
FROM ghcr.io/oracle/macaron-deps:latest@sha256:99526baf6596c4c3f24e4caa2b59afaf7f7c26d633ad3113ca24ba43dfad3f0f as deps_stage
15-
1614
FROM ghcr.io/oracle/macaron-base:latest@sha256:79b3b8b03cb9b6a124c6450f4baa58f96f83ee9e37f572c88a97597b35c7bc51
1715

1816
ENV HOME="/home/macaron"
@@ -37,17 +35,11 @@ ARG WHEEL_PATH
3735
# the warning of not having correct ownership of /home/macaron is not raised.
3836
USER macaron:macaron
3937
COPY --chown=macaron:macaron $WHEEL_PATH $HOME/dist/
40-
# Currently, the only dependency stored in the minimal image is the wheel for Semgrep, which we copy here. Since the
41-
# Macaron project dependencies lists Semgrep as a python dependency, we uninstall it first before using our wheel here
42-
# to install a trusted built-from-source version.
43-
COPY --chown=macaron:macaron --from=deps_stage /semgrep-*manylinux*.whl $HOME/dist/
4438
RUN : \
4539
&& python3 -m venv $HOME/.venv \
4640
&& . .venv/bin/activate \
4741
&& pip install --no-compile --no-cache-dir --upgrade pip setuptools \
4842
&& find $HOME/dist -depth \( -type f \( -name "macaron-*.whl" \) \) -exec pip install --no-compile --no-cache-dir '{}' \; \
49-
&& pip uninstall semgrep -y \
50-
&& find $HOME/dist -depth \( -type f \( -name "semgrep-*.whl" \) \) -exec pip install --no-compile --no-cache-dir '{}' \; \
5143
&& rm -rf $HOME/dist \
5244
&& deactivate
5345

0 commit comments

Comments
 (0)