diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml index 0d16ee1..5465d65 100644 --- a/.github/workflows/container.yml +++ b/.github/workflows/container.yml @@ -4,6 +4,9 @@ on: push: branches: - main + - ipfs-adapter + + workflow_dispatch: jobs: build: @@ -30,7 +33,7 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - + ### Build and push docker image - name: Build and push id: docker_build diff --git a/Dockerfile b/Dockerfile index fc99d22..5a9db0f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ ### NOTE: original linuxserver.org docker-ipfs image also builds & runs migrations. ### If needed, go to https://github.com/linuxserver/docker-ipfs to see how it's done. - + FROM ipfs/go-ipfs:v0.9.0 as ipfs -FROM fluencelabs/fluence:vault as fluence +FROM fluencelabs/fluence:latest as fluence FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic @@ -40,10 +40,12 @@ RUN \ rm -rf \ /tmp/* \ /var/lib/apt/lists/* \ - /var/tmp/* + /var/tmp/* && \ +echo "**** download ipfs-adapter ****" && \ +curl https://github.com/fluencelabs/ipfs-adapter/releases/latest/download/ipfs-adapter.tar.gz -L | tar -zxv -C /builtins/ -# copy configs -# NOTE: copy configs should be after installing packages because +# copy configs +# NOTE: copy configs should be after installing packages because # configs may replace default configs of installed packages COPY s6/root/ / diff --git a/docker-compose.yml b/docker-compose.yml index 8ec9fdc..c88e9f7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,15 +19,15 @@ services: - fluence:/.fluence networks: - fluence - + env.json: restart: "no" - # depends_on: + # depends_on: # - fluence image: busybox:stable - volumes: + volumes: - env.json:/env - command: + command: - sh - -c - | @@ -43,16 +43,16 @@ services: EOF dashboard: - depends_on: + depends_on: - env.json image: fluencelabs/dashboard:latest volumes: - env.json:/dist/env - networks: + networks: - fluence ports: - 8080:8080 - + volumes: fluence: null env.json: null