diff --git a/docker-compose.yml b/docker-compose.yml index d32c96a..e0296b8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -48,8 +48,6 @@ services: build: context: ./ssb-server dockerfile: Dockerfile - ports: - - "8008:8008" volumes: - ~/.ssb-test/:/home/astroport/.ssb secret2dunikey: diff --git a/ssb-server/Dockerfile b/ssb-server/Dockerfile index 89099e1..6cd34b0 100644 --- a/ssb-server/Dockerfile +++ b/ssb-server/Dockerfile @@ -30,7 +30,6 @@ RUN . ~/.bashrc && \ npm install -g sodium-native@3.0.0 ssb-backlinks@1.0.0 && \ npm install -g ssb-server@15.2.0 -COPY ./config /home/astroport/.ssb/ COPY ./run-ssb-pub.sh /home/astroport/run-ssb-pub.sh EXPOSE 8008 diff --git a/ssb-server/config b/ssb-server/config deleted file mode 100644 index a5e8019..0000000 --- a/ssb-server/config +++ /dev/null @@ -1,19 +0,0 @@ -{ - "connections": { - "incoming": { - "net": [ - { - "scope": "public", "external": ["0.0.0.0"], "transform": "shs", "port": 8008 - }, - { "scope": "private", "transform": "shs", "port": 8008, "host": "0.0.0.0" } - ] - }, - "outgoing": { - "net": [ - { - "transform": "shs" - } - ] - } - } -} \ No newline at end of file diff --git a/tip/Dockerfile b/tip/Dockerfile index f956337..3baea19 100644 --- a/tip/Dockerfile +++ b/tip/Dockerfile @@ -2,27 +2,40 @@ FROM debian@sha256:bf338ddc710dfb9b907a29ba661b35d0f6b3eae043515c4315f64c6e93409 LABEL MAINTAINER=chamalow <@qio8/4L4vnzq3qRD0dqKI7sTpey54u8ZWbaICfpJOZw=.ed25519> -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND noninteractive +ENV NVM_INSTALL_DIR /opt/nvm +ENV NVM_DIR /usr/local/nvm +ENV NODE_VERSION v12.16.1 + +COPY ./tip/sbotc.sh /usr/bin/sbotc 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 && \ + 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 git=1:2.25.1-1 -y && \ pip3 install duniterpy==0.56.0 silkaj==0.7.6 && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ - useradd -ms /bin/bash astroport - -RUN git clone https://git.scuttlebot.io/%25133ulDgs%2FoC1DXjoK04vDFy6DgVBB%2FZok15YJmuhD5Q%3D.sha256 sbotc -WORKDIR /sbotc -RUN make && make install + useradd -ms /bin/bash astroport && \ + chmod +x /usr/bin/sbotc +RUN git clone https://github.com/creationix/nvm.git $NVM_INSTALL_DIR && \ + . $NVM_INSTALL_DIR/nvm.sh && \ + nvm install --lts && \ + nvm alias default $NODE_VERSION && \ + nvm use default && \ + echo "export NVM_DIR=${NVM_DIR}" > /home/astroport/.bashrc && \ + echo ". ${NVM_INSTALL_DIR}/nvm.sh" > /home/astroport/.bashrc && \ + chown -R astroport:astroport $NVM_DIR COPY ./samples /home/astroport/samples COPY ./tip.sh /home/astroport/tip RUN chmod +x /home/astroport/samples /home/astroport/tip USER astroport +RUN . ~/.bashrc && \ + mkdir -p /home/astroport/.ssb/ && \ + npm install -g sodium-native@3.0.0 ssb-backlinks@1.0.0 && \ + npm install -g ssb-server@15.2.0 WORKDIR /home/astroport -RUN mkdir .ssb VOLUME [ "/home/astroport/.ssb"] ENTRYPOINT ["/bin/bash"] CMD ["/home/astroport/tip"] diff --git a/tip/sbotc.sh b/tip/sbotc.sh new file mode 100644 index 0000000..d25f413 --- /dev/null +++ b/tip/sbotc.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. ~/.bashrc + +ssb-server --host ssb-server --port 8008 $@ \ No newline at end of file