fixes to docker-image.yml GH action

This commit is contained in:
Eran Davidovich 2021-12-22 00:05:44 +02:00
parent c9b0b32989
commit 2d9096440d
2 changed files with 2 additions and 4 deletions

View File

@ -28,7 +28,7 @@ jobs:
with: with:
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:${{ github.sha }} tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-attest${{ github.sha::7 }}
target: p2w-attest target: p2w-attest
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-attest cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-attest
cache-to: type=inline cache-to: type=inline
@ -39,7 +39,7 @@ jobs:
with: with:
platforms: linux/amd64 platforms: linux/amd64
push: true push: true
tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:${{ github.sha }} tags: ${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-relay${{ github.sha::7 }}
target: p2w-relay target: p2w-relay
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-relay cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/pyth2wormhole:p2w-relay
cache-to: type=inline cache-to: type=inline

View File

@ -15,7 +15,6 @@ RUN ./build.sh
# Cache a build of TypeScript gRPC bindings # Cache a build of TypeScript gRPC bindings
FROM node:16-alpine@sha256:004dbac84fed48e20f9888a23e32fa7cf83c2995e174a78d41d9a9dd1e051a20 AS base-node FROM node:16-alpine@sha256:004dbac84fed48e20f9888a23e32fa7cf83c2995e174a78d41d9a9dd1e051a20 AS base-node
ARG WH_ROOT=/usr/src/wormhole ARG WH_ROOT=/usr/src/wormhole
ENV WH_ROOT=$WH_ROOT
# Copy go build artifacts # Copy go build artifacts
COPY --from=base-go $WH_ROOT/tools $WH_ROOT/tools COPY --from=base-go $WH_ROOT/tools $WH_ROOT/tools
COPY buf.* $WH_ROOT/ COPY buf.* $WH_ROOT/
@ -37,7 +36,6 @@ ARG WH_BRIDGE="11111111111111111111111111111116"
ARG WH_ROOT=/usr/src/wormhole ARG WH_ROOT=/usr/src/wormhole
ENV EMITTER_ADDRESS=$WH_EMITTER ENV EMITTER_ADDRESS=$WH_EMITTER
ENV BRIDGE_ADDRESS=$WH_BRIDGE ENV BRIDGE_ADDRESS=$WH_BRIDGE
ENV WH_ROOT=$WH_ROOT
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y \ apt-get install -y \