Skip to content

Commit

Permalink
Merge pull request #122 from kaleido-io/build-docker
Browse files Browse the repository at this point in the history
Add docker build to PR builds; fix paths in Dockerfile
  • Loading branch information
nguyer authored Jan 25, 2024
2 parents 7300295 + 6359310 commit 73fc96b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
21 changes: 20 additions & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,30 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: "1.21"
go-version: '1.21'
check-latest: true

- name: Build and Test
run: make

- name: Upload coverage
run: bash <(curl -s https://codecov.io/bash)
docker:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Set build tag
id: build_tag_generator
run: |
RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger/firefly-fabconnect/releases/latest -s | jq .tag_name -r)
BUILD_TAG=$RELEASE_TAG-$(date +"%Y%m%d")-$GITHUB_RUN_NUMBER
echo ::set-output name=BUILD_TAG::$BUILD_TAG
- name: Build
run: |
docker build \
--label commit=$GITHUB_SHA \
--label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
--label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
--tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
FROM golang:1.21-alpine3.19 AS fabconnect-builder
RUN apk add make
ADD --chown=1001:0 . /fabconnect
ADD . /fabconnect
WORKDIR /fabconnect
RUN mkdir /.cache \
&& chgrp -R 0 /.cache \
&& chmod -R g+rwX /.cache
USER 1001
RUN make

FROM alpine:3.19
WORKDIR /fabconnect
COPY --from=fabconnect-builder --chown=1001:0 /fabconnect/fabconnect ./
COPY --from=fabconnect-builder /fabconnect/fabconnect ./
ADD ./openapi ./openapi/
RUN ln -s /fabconnect/fabconnect /usr/bin/fabconnect
RUN chgrp -R 0 /openapi && \
chmod -R g+rwX /openapi
USER 1001
ENTRYPOINT [ "fabconnect" ]

0 comments on commit 73fc96b

Please sign in to comment.