diff --git a/docker-compose.yml b/docker-compose.yml index d829ba0..db73986 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,4 +59,6 @@ services: tip: build: context: . - dockerfile: ./tip/Dockerfile \ No newline at end of file + dockerfile: ./tip/Dockerfile + links: + - "ssb-server:ssb-server" \ No newline at end of file diff --git a/readme.md b/readme.md index 269cadb..e83b7c4 100644 --- a/readme.md +++ b/readme.md @@ -102,13 +102,13 @@ docker-compose build create your dunikey ``` -docker run -ti --rm -v ~/.ssb:/home/astroport/.ssb ssb-g1like_secret2dunikey +docker-compose run --rm -v ~/.ssb:/home/astroport/.ssb ssb-g1like_secret2dunikey ``` run main tip script ``` -docker run -ti --rm -v ~/.ssb:/home/astroport/.ssb ssb-g1like_tip +docker-compose run --rm -v ~/.ssb:/home/astroport/.ssb ssb-g1like_tip ``` ## Authors diff --git a/tip/Dockerfile b/tip/Dockerfile index 85afdda..f956337 100644 --- a/tip/Dockerfile +++ b/tip/Dockerfile @@ -4,12 +4,8 @@ LABEL MAINTAINER=chamalow <@qio8/4L4vnzq3qRD0dqKI7sTpey54u8ZWbaICfpJOZw=.ed25519 ENV DEBIAN_FRONTEND noninteractive -COPY ./tip.sh /usr/bin/tip -COPY ./samples / - RUN apt-get update -y && \ apt-get install autoconf=2.69-11.1 build-essential=12.8 python3-pip=18.1-5 python3-setuptools=44.0.0-1 libsodium-dev=1.0.18-1 jq=1.6-1 make=4.2.1-1.2 git=1:2.25.1-1 gcc=4:9.2.1-3.1 base58=1.0.3-1 libtool=2.4.6-14 curl=7.68.0-1 -y && \ - chmod +x /usr/bin/tip && \ pip3 install duniterpy==0.56.0 silkaj==0.7.6 && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ @@ -19,9 +15,14 @@ RUN git clone https://git.scuttlebot.io/%25133ulDgs%2FoC1DXjoK04vDFy6DgVBB%2FZok WORKDIR /sbotc RUN make && make install + +COPY ./samples /home/astroport/samples +COPY ./tip.sh /home/astroport/tip +RUN chmod +x /home/astroport/samples /home/astroport/tip + USER astroport WORKDIR /home/astroport -RUN mkdir .ssb +RUN mkdir .ssb VOLUME [ "/home/astroport/.ssb"] ENTRYPOINT ["/bin/bash"] -CMD ["/usr/bin/tip"] +CMD ["/home/astroport/tip"]