From 4ab7f5096fd219a986e048254baea47b77d34393 Mon Sep 17 00:00:00 2001 From: Nick Volynkin Date: Wed, 31 May 2023 14:23:38 +0300 Subject: [PATCH] Build final docker image --- .github/workflows/docker.yml | 5 +++-- Dockerfile | 7 ++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e9bf7d28a..31997997d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -3,7 +3,7 @@ name: Check and build Dockerfile on: push: branches: [ master ] - pull_request: +# pull_request: concurrency: group: ${{ @@ -43,6 +43,7 @@ jobs: run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin - name: Pull ${{ env.IMAGE_NAME }}:base + if: steps.changes.outputs.dockerfile-base == 'false' run: docker pull ${{ env.IMAGE_NAME }}:base || true - name: Rebuild ${{ env.IMAGE_NAME }}:base @@ -53,7 +54,7 @@ jobs: if: github.ref == 'refs/heads/master' && steps.changes.outputs.dockerfile-base == 'true' run: docker push ${{ env.IMAGE_NAME }}:base - - name: Build a Docker image + - name: Rebuild ${{ env.IMAGE_NAME }}:latest run: docker build -t ${{ env.IMAGE_NAME }}:latest . - name: Push ${{ env.IMAGE_NAME }}:latest to GitHub registry diff --git a/Dockerfile b/Dockerfile index 97a339ea4..33ff23e80 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,12 @@ WORKDIR /proof-market-toolchain COPY . /proof-market-toolchain -RUN ./build.sh +RUN ./build.sh \ + && mkdir /proof-market-toolchain/.config \ + && touch /proof-market-toolchain/.config/config.ini \ + && mkdir /root/.config \ + && touch /root/.config/config.ini \ + && ln -s /proof-market-toolchain/build/bin/proof-generator/proof-generator /usr/bin/proof-generator #FROM ghcr.io/nilfoundation/proof-market-toolchain:base #