Skip to content

Commit

Permalink
Merge pull request #59 from mmacata/version+docker
Browse files Browse the repository at this point in the history
fix version to not be dirty after release
  • Loading branch information
mmacata authored Oct 31, 2019
2 parents a8ff003 + fe6d8db commit 04e4f39
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ docker
!docker/actinia-core/actinia.cfg
!docker/actinia-core/start.sh
!docker/actinia-core/start-dev.sh
.gitignore
.github
.travis
.travis.yml
Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ __See below for production deployment__.

For actinia_core development, run and enter the running container (in a separate terminal):
```
docker-compose run --rm --entrypoint /bin/bash -v $HOME/repos/actinia_core/src:/src/actinia_core/src actinia-core
docker-compose run --rm --service-ports --entrypoint /bin/bash -v $HOME/repos/actinia_core/src:/src/actinia_core/src actinia-core
docker-compose -f docker-compose-dev.yml run --rm --entrypoint /bin/bash -v $HOME/repos/actinia/actinia_core/src:/src/actinia_core/src -v $HOME/repos/actinia/actinia_core/scripts:/src/actinia_core/scripts actinia-core```
docker-compose -f docker-compose-dev.yml run --rm --service-ports --entrypoint /bin/bash -v $HOME/repos/actinia/actinia_core/src:/src/actinia_core/src -v $HOME/repos/actinia/actinia_core/scripts:/src/actinia_core/scripts actinia-core
```

Inside the container, you can run GRASS GIS with:
Expand Down
7 changes: 7 additions & 0 deletions docker/actinia-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ COPY . /src/actinia_core
RUN ln -s /actinia_core /root/actinia

WORKDIR /src/actinia_core
# necessary to be even with git for clean version
RUN git checkout .
# update build tools
RUN python3 -m pip install --user --upgrade setuptools wheel
# create build
RUN python3 setup.py sdist bdist_wheel
# install
RUN pip3 install -r requirements.txt && python3 setup.py install
## TODO: fix tests
#\
Expand Down

0 comments on commit 04e4f39

Please sign in to comment.