Skip to content

Commit

Permalink
Fix incorrect COPY in Dockerfile and don't set default org if no cumu…
Browse files Browse the repository at this point in the history
…lusci.yml file exists
  • Loading branch information
jlantz committed May 2, 2024
1 parent de5ac6b commit ee5126e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 15 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ RUN pip install --no-cache-dir --upgrade pip pip-tools \
pip --no-cache-dir install git+https://github.com/muselab-d2x/d2x-cli@main cookiecutter

# Copy devhub auth script and make it executable
COPY devhub.sh /usr/local/bin/d2x_job_run.sh
COPY d2x_job_run.sh /usr/local/bin/d2x_job_run.sh
COPY devhub.sh /usr/local/bin/devhub.sh
RUN chmod +x /usr/local/bin/d2x_job_run.sh
RUN chmod +x /usr/local/bddin/d2x_job_run.sh
RUN chmod +x /usr/local/bin/devhub.sh

# Create d2x user
Expand Down
12 changes: 0 additions & 12 deletions d2x_job_run.sh

This file was deleted.

2 changes: 1 addition & 1 deletion devhub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ else
[[ -f /tmp/target_org_auth_url ]] && rm /tmp/target_org_auth_url
fi

if [ "`whoami`" == "d2x" ]; then
if [ "`whoami`" == "d2x" && -f "cumulusci.yml" ]; then
echo "Setting dev as the default org"
cci org default dev
fi
Expand Down

0 comments on commit ee5126e

Please sign in to comment.