From e80d8afade6755c9acc09ba8bdc70a6f1fce2737 Mon Sep 17 00:00:00 2001 From: musou1500 Date: Fri, 26 Apr 2019 12:20:32 +0900 Subject: [PATCH 1/3] make dots_client/entry_point.sh executable --- dots_client/entry_point.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 dots_client/entry_point.sh diff --git a/dots_client/entry_point.sh b/dots_client/entry_point.sh old mode 100644 new mode 100755 From 4c02a55c8d6f79e8102e2573c5f7067c43fae641 Mon Sep 17 00:00:00 2001 From: musou1500 Date: Fri, 26 Apr 2019 12:27:13 +0900 Subject: [PATCH 2/3] fix version of dependencies --- Dockerfile | 10 +++++----- gobgp-server/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9b26466..0a8d7c6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,9 @@ ENV HOME /root RUN apt-get update && apt-get -y install wget curl git build-essential libtool autoconf pkgconf RUN apt-get install -q -y mysql-server libmysqld-dev -# install go1.9.3 -RUN wget https://dl.google.com/go/go1.9.3.linux-amd64.tar.gz -RUN tar -C /usr/local -xzf go1.9.3.linux-amd64.tar.gz +# install go1.11.9 +RUN wget https://dl.google.com/go/go1.11.9.linux-amd64.tar.gz +RUN tar -C /usr/local -xzf go1.11.9.linux-amd64.tar.gz RUN mkdir $HOME/go @@ -30,7 +30,7 @@ RUN echo '/usr/local/lib' >> /etc/ld.so.conf WORKDIR $HOME RUN git clone https://github.com/obgm/libcoap.git WORKDIR $HOME/libcoap -RUN git checkout 1365dea39a6129a9b7e8c579537e12ffef1558f6 +RUN git checkout 1eadd91366cab46767f26e4d10e005198246eac1 RUN ./autogen.sh RUN ./configure --disable-documentation --with-openssl RUN make && make install @@ -40,4 +40,4 @@ RUN ldconfig WORKDIR $HOME RUN go get -u github.com/nttdots/go-dots/... WORKDIR $GOPATH/src/github.com/nttdots/go-dots/ -RUN make && make install \ No newline at end of file +RUN make && make install diff --git a/gobgp-server/Dockerfile b/gobgp-server/Dockerfile index 7c056d6..15d7417 100644 --- a/gobgp-server/Dockerfile +++ b/gobgp-server/Dockerfile @@ -6,8 +6,8 @@ WORKDIR /root RUN apt-get update && \ apt-get upgrade -y && \ apt-get install -y git gcc wget && \ - wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz && \ - tar xf go1.8.linux-amd64.tar.gz -C /usr/local/ && rm go1.8.linux-amd64.tar.gz && \ + wget https://dl.google.com/go/go1.11.9.linux-amd64.tar.gz && \ + tar xf go1.11.9.linux-amd64.tar.gz -C /usr/local/ && rm go1.11.9.linux-amd64.tar.gz && \ ln -s /usr/local/go/bin/go /usr/local/bin/go&& \ go get github.com/osrg/gobgp/... From 174aea91c3c47600179b2e14ca55829033b607f8 Mon Sep 17 00:00:00 2001 From: musou1500 Date: Fri, 26 Apr 2019 13:25:03 +0900 Subject: [PATCH 3/3] fix working_dir --- example/dots_client/docker-compose.yml | 2 +- example/dots_server/docker-compose.yml | 2 +- example/onebox/docker-compose.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example/dots_client/docker-compose.yml b/example/dots_client/docker-compose.yml index 122ad49..b1463f0 100644 --- a/example/dots_client/docker-compose.yml +++ b/example/dots_client/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: dots_client build: ../../ image: dots_base - working_dir: /go/src/github.com/nttdots/go-dots + working_dir: /root/go/src/github.com/nttdots/go-dots entrypoint: ./dots_client/entry_point.sh networks: - dots_client_net diff --git a/example/dots_server/docker-compose.yml b/example/dots_server/docker-compose.yml index d7f6303..43d3ed8 100644 --- a/example/dots_server/docker-compose.yml +++ b/example/dots_server/docker-compose.yml @@ -12,7 +12,7 @@ services: ports: - 4646:4646/udp - 4647:4647/udp - working_dir: /go/src/github.com/nttdots/go-dots/dots_server + working_dir: /root/go/src/github.com/nttdots/go-dots/dots_server entrypoint: ./entry_point.sh volumes: - ./config/dots_server.yaml:/etc/dots_server.yaml:ro diff --git a/example/onebox/docker-compose.yml b/example/onebox/docker-compose.yml index 196a5b7..3ad3429 100644 --- a/example/onebox/docker-compose.yml +++ b/example/onebox/docker-compose.yml @@ -10,7 +10,7 @@ services: ipv6_address: 2001:db8::8 depends_on: - dots_server - working_dir: /go/src/github.com/nttdots/go-dots + working_dir: /root/go/src/github.com/nttdots/go-dots entrypoint: ./dots_client/entry_point.sh environment: - DOTS_SERVER=2001:db8::9 @@ -28,7 +28,7 @@ services: dots_net: ipv4_address: 172.16.238.11 ipv6_address: 2001:db8::9 - working_dir: /go/src/github.com/nttdots/go-dots/dots_server + working_dir: /root/go/src/github.com/nttdots/go-dots/dots_server command: dots_server -vv -config /etc/dots_server.yaml volumes: - ./config/dots_server.yaml:/etc/dots_server.yaml:ro