Skip to content

Commit

Permalink
updated dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Kapim committed Dec 12, 2019
1 parent f2167bd commit 44996ba
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 36 deletions.
2 changes: 1 addition & 1 deletion Dockerfile-arserver
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arcor2/arcor2_base:latest
FROM arcor2/arcor2_base

RUN ln -s /root/arcor2/docker/start-arserver.sh /start.sh

Expand Down
5 changes: 0 additions & 5 deletions Dockerfile-base
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
FROM python:3

RUN cd \
&& git clone https://github.com/s-knibbs/dataclasses-jsonschema.git \
&& cd dataclasses-jsonschema \
&& pip install -e .

RUN cd \
&& git clone https://github.com/capripot/wait-for.git \
&& cd wait-for \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM arcor2/arcor2_base:latest
FROM arcor2/arcor2_base

RUN ln -s /root/arcor2/docker/start-build.sh /start.sh

2 changes: 1 addition & 1 deletion Dockerfile-execution
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM arcor2/arcor2_base:latest
FROM arcor2/arcor2_base

RUN ln -s /root/arcor2/docker/start-execution.sh /start.sh
44 changes: 23 additions & 21 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
version: '3'

services:
arcor:
image: arcor2/arcor2_arserver:latest
container_name: arcor2
arserver:
image: arcor2/arcor2_kinali
container_name: arserver
depends_on:
- pickmaster-storage
- project
- build
- execution
ports:
- "6789:6789"
environment:
- ARCOR2_PERSISTENT_STORAGE_URL=http://pickmaster-storage:11000
- ARCOR2_EXECUTION_URL=ws://arcor2_execution:6790
arcor2_build:
image: arcor2/arcor2_build:latest
container_name: arcor2_build
arcor2_execution:
image: arcor2/arcor2_execution:latest
container_name: arcor2_execution
- ARCOR2_PERSISTENT_STORAGE_URL=http://project:11000
- ARCOR2_EXECUTION_URL=ws://execution:6790
build:
image: arcor2/arcor2_build
container_name: build
execution:
image: arcor2/arcor2_execution
container_name: execution
environment:
- ARCOR2_BUILDER_URL=http://arcor2_build:5007
pickmaster-storage:
image: kinalisoft/storage:0.3.1
container_name: "pickmaster-storage"
- ARCOR2_BUILDER_URL=http://build:5007
project:
image: kinalisoft/storage:0.6.1
container_name: "project"
ports:
- "11000-11001:11000-11001"
environment:
MONGODB_URL: pickmaster-mongodb:27017
MONGODB_URL: mongodb:27017
links:
- pickmaster-mongodb
- mongodb
depends_on:
- pickmaster-mongodb
- mongodb

pickmaster-mongodb:
mongodb:
image: mongo:4.2.0-bionic
container_name: "pickmaster-mongodb"
container_name: "mongodb"
environment:
- MONGO_DATA_DIR=/data/db
- MONGO_LOG_DIR=/dev/null
Expand Down
7 changes: 0 additions & 7 deletions docker/start.sh

This file was deleted.

0 comments on commit 44996ba

Please sign in to comment.