Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix docker configuration #33

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
RUN make && make install
Empty file modified dots_client/entry_point.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion example/dots_client/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/dots_server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions example/onebox/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gobgp-server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/...

Expand Down