fix(ci): web3 & web3-indexer docker build

godwokenrises · Jan 30, 2023 · 1a31745 · 1a31745
1 parent c2be27a
commit 1a31745
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/web3-docker-publish.yml b/.github/workflows/web3-docker-publish.yml
@@ -60,7 +60,7 @@ jobs:
  if: ${{ github.ref_type != 'tag' }}
  uses: docker/build-push-action@v2
  with:
- context: ./web3
+ file: ./web3/Dockerfile
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.meta.outputs.tags }}-${{ steps.commit.outputs.sha_short }}
  labels: ${{ steps.meta.outputs.labels }}
@@ -79,7 +79,7 @@ jobs:
  if: ${{ startsWith(github.ref, 'refs/tags') }}
  uses: docker/build-push-action@v2
  with:
- context: ./web3 
+ file: ./web3/Dockerfile
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.split.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/web3-indexer-docker-publish.yml b/.github/workflows/web3-indexer-docker-publish.yml
@@ -61,7 +61,6 @@ jobs:
  uses: docker/build-push-action@v2
  with:
  file: web3/docker/indexer/Dockerfile
- context: ./web3
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.meta.outputs.tags }}-${{ steps.commit.outputs.sha_short }}
  labels: ${{ steps.meta.outputs.labels }}
@@ -81,7 +80,6 @@ jobs:
  uses: docker/build-push-action@v2
  with:
  file: web3/docker/indexer/Dockerfile
- context: ./web3
  push: ${{ github.event_name != 'pull_request' }}
  tags: ${{ steps.split.outputs.tags }}
  labels: ${{ steps.meta.outputs.labels }}

diff --git a/web3/Dockerfile b/web3/Dockerfile
@@ -1,8 +1,11 @@
 
 FROM node:14-bullseye
 
-COPY . /godwoken-web3/.
-RUN cd /godwoken-web3 && yarn && yarn build
+COPY . /godwoken/.
+
+WORKDIR /godwoken/web3
+
+RUN yarn && yarn build
 
 RUN npm install pm2 -g
 

diff --git a/web3/docker/indexer/Dockerfile b/web3/docker/indexer/Dockerfile
@@ -3,8 +3,9 @@ FROM rust:1-bullseye as builder
 RUN apt-get update
 RUN apt-get -y install --no-install-recommends llvm-dev clang libclang-dev libssl-dev
 
-COPY . /godwoken-web3
-RUN cd /godwoken-web3 && rustup component add rustfmt && cargo build --release
+COPY . /godwoken
+WORKDIR /godwoken/web3
+RUN rustup component add rustfmt && cargo build --release
 
 FROM ubuntu:focal