Skip to content

Commit

Permalink
ensure we add dyninst dev (shouldnt be necessary but being extra careful
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
  • Loading branch information
vsoch committed Mar 9, 2022
1 parent cca8c97 commit b83cd5e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ ARG dyninst_base=ghcr.io/dyninst/dyninst-ubuntu-20.04:latest
FROM ${dyninst_base}

# docker build --build-arg dyninst_base=ghcr.io/dyninst/dyninst-ubuntu-20.04:latest -f Dockerfile.test -t dyninst-test ../
# docker build --build-arg DYNINST_BRANCH=kupsch/parse-callsites-preview-2 -t ghcr.io/dyninst/dyninst-branch-builder:callsites-2 .

# Ensure the package file with branch "dev" is added
COPY ./package.py /opt/spack/var/spack/repos/builtin/packages/dyninst/package.py
Expand All @@ -16,8 +17,12 @@ RUN rm -rf /code && \
cd /code && \

# Be consistent in branch name so we don't need to update below
git checkout -b dev ${DYNINST_BRANCH}

git checkout -b dev ${DYNINST_BRANCH} && \
. /opt/spack/share/spack/setup-env.sh && \
spack env activate . && \
spack remove dyninst && \
spack add dyninst@dev && \

# Previous WORKDIR, just to be careful - reinstall dyninst if needed
# Thenbuild and run the test suite
WORKDIR /opt/dyninst-env
Expand Down

0 comments on commit b83cd5e

Please sign in to comment.