Skip to content

Commit

Permalink
Merge pull request hitachienergy#10 from seriva/fix/docker-updates
Browse files Browse the repository at this point in the history
Updated docker files and documentation on usage.
  • Loading branch information
erzetpe authored Jan 10, 2019
2 parents 19203b1 + 56b0dd5 commit 7bb0c0e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ certs/
tests/
Dockerfile

data/
build/
core/data/
core/build/
2 changes: 1 addition & 1 deletion core/core/src/docker/deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM epiphany-dev:latest

ADD . /epiphany/
ADD ./core/ /epiphany/

RUN mkdir /epiphany/data/ \
&& mkdir /epiphany/build/
Expand Down
5 changes: 4 additions & 1 deletion core/core/src/docker/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,11 @@ RUN set -x && \
echo "==> Installing Ansible..." && \
pip install ansible==${ANSIBLE_VERSION} && \
\
echo "==> installing azure-cli" && \
echo "==> installing azure-cli..." && \
pip install azure-cli && \
# Uninstall pyOpenSSL: https://github.com/erjosito/ansible-azure-lab/issues/5
echo "==> un-installing pyOpenSSL... " && \
pip uninstall -y pyOpenSSL && \
\
echo "==> Cleaning up..." && \
apk del build-dependencies && \
Expand Down
6 changes: 3 additions & 3 deletions docs/home/HOWTO.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ Now, to build it locally and run it:


1. Run the following to build the image locally:
```docker build -t epiphany-dev -f core/src/docker/dev/Dockerfile .```
```docker build -t epiphany-dev -f core/core/src/docker/dev/Dockerfile .```
2. To run the locally build image in a container use:
```docker run -it -v LOCAL_DEV_DIR:/epiphany --rm epiphany-dev```
Where ```LOCAL_DEV_DIR``` should be replaced with the local path to you're core and data repositories. This will then be mapped to ```/epiphany``` inside the container. If everything is ok you will be presentated with a bash terminal from which one can run the Epiphany engine. Note that when filling in your data YAMLs one needs to specify the paths from the containers point of view.
Where ```LOCAL_DEV_DIR``` should be replaced with the local path to you're epiphany repository. This will then be mapped to ```/epiphany``` inside the container. If everything is ok you will be presentated with a bash terminal from which one can run the Epiphany engine. Note that when filling in your data YAMLs one needs to specify the paths from the containers point of view.



Expand All @@ -105,7 +105,7 @@ For people who are only using the Epiphany engine to deploy and maintain cluster
To get it from the registry and run it:
1. Build an dev image described [here](#docker-image-for-development).
2. Run the following command to build the deployment image locally:
```docker build -t epiphany-deploy -f core/src/docker/deploy/Dockerfile .```
```docker build -t epiphany-deploy -f core/core/src/docker/deploy/Dockerfile .```
3. To run the pulled image in a container use:


Expand Down

0 comments on commit 7bb0c0e

Please sign in to comment.