Skip to content

Commit

Permalink
Merge pull request #16 from jgericke:develop
Browse files Browse the repository at this point in the history
Modify Dockerfile to use pip based installation of engine
  • Loading branch information
jgericke committed Jun 5, 2019
2 parents a12933b + 7b68dd3 commit 92089bf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
18 changes: 4 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
FROM python:3.7
LABEL maintainer="Julian Gericke <[email protected]>"
LABEL application="automaton"
LABEL version="1.0.0"
WORKDIR /opt/automaton
ADD actions /opt/automaton/actions
ADD automaton /opt/automaton/automaton
ADD bin /opt/automaton/bin
COPY setup.cfg setup.py LICENSE ./
LABEL application="automaton-engine"
LABEL version="1.0.1"
RUN set -x \
&& python setup.py build \
&& python setup.py install
RUN set -x \
&& useradd -u 1001 -M -g root -r automaton \
&& chown -R 1001:0 /opt/automaton \
&& chmod -R ug+rwx /opt/automaton
&& pip install automaton-engine
USER 1001
CMD python /opt/automaton/bin/auto.py
CMD automaton-engine
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,9 @@ release: dist

install: clean
python setup.py install

build-docker:
docker build --rm -t automaton-engine:latest -t automaton-engine:1.0.1 .

build-docker-nocache:
docker build --no-cache -t automaton-engine:latest -t automaton-engine:1.0.1 .

0 comments on commit 92089bf

Please sign in to comment.