Skip to content

Commit

Permalink
Merge pull request #18 from Kapim/master
Browse files Browse the repository at this point in the history
typo
  • Loading branch information
Kapim authored Dec 17, 2019
2 parents 77d36a3 + c53659d commit 6380d93
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile-arserver
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG version latest
ARG version=latest
FROM arcor2/arcor2_base:$version

RUN ln -s /root/arcor2/docker/start-arserver.sh /start.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG version latest
ARG version=latest
FROM arcor2/arcor2_base:$version

RUN ln -s /root/arcor2/docker/start-build.sh /start.sh
Expand Down
3 changes: 1 addition & 2 deletions docker/Dockerfile-execution
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
ARG version latest
ARG version=latest
FROM arcor2/arcor2_base:$version


RUN ln -s /root/arcor2/docker/start-execution.sh /start.sh
4 changes: 4 additions & 0 deletions docker/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
docker build -f Dockerfile-arserver -t arcor2/arcor2_arserver:`cat ../arcor2/VERSION` ../ --build-arg version=`cat ../arcor2/VERSION`
docker build -f Dockerfile-build -t arcor2/arcor2_build:`cat ../arcor2/VERSION` --build-arg version=`cat ../arcor2/VERSION` ../
docker build -f Dockerfile-execution -t arcor2/arcor2_execution:`cat ../arcor2/VERSION` --build-arg version=`cat ../arcor2/VERSION` ../

0 comments on commit 6380d93

Please sign in to comment.