Skip to content

Commit

Permalink
Renamed files
Browse files Browse the repository at this point in the history
  • Loading branch information
raphaelchang committed Mar 10, 2016
1 parent 13cb5c8 commit 7f83cca
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ RUN sudo apt-get -y install python-pip
RUN pip install tornado

# setup roscloud_client
RUN git clone https://github.com/roscloud/roscloud_client /root/catkin_ws/src/roscloud_client
COPY ./roscloud_container.launch /root/catkin_ws/src/roscloud_client/launch/
RUN git clone https://github.com/canopy-ros/canopy_client /root/catkin_ws/src/canopy_client
COPY ./canopy_container.launch /root/catkin_ws/src/canopy_client/launch/

# setup entrypoint
COPY ./roscloud_entrypoint.sh /
RUN chmod +x /roscloud_entrypoint.sh
COPY ./canopy_entrypoint.sh /
RUN chmod +x /canopy_entrypoint.sh

ENTRYPOINT ["/roscloud_entrypoint.sh"]
ENTRYPOINT ["/canopy_entrypoint.sh"]
CMD ["bash"]
File renamed without changes.
File renamed without changes.
Binary file modified dump.rdb
Binary file not shown.
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ var port = flag.String("port", "5000", "http service port")

func main() {
flag.Parse()
log.Println("ROSCloud container management server started.")
log.Println("Canopy container management server started.")
// Start docker client
defaultHeaders := map[string]string{"User-Agent": "engine-api-cli-1.0"}
cli, err := client.NewClient("unix:///var/run/docker.sock",
Expand Down

0 comments on commit 7f83cca

Please sign in to comment.