Merge pull request #3 from MegafonWebLab/build-improve

improve build

Author: ns3777k

.dockerignore

@@ -0,0 +1,2 @@
+*
+!/target/bin/linux/amd64

.github/workflows/ci.yml

@@ -23,16 +23,6 @@ jobs:
       - name: Build ui
         run: make build-ui
 
-      - name: Publish to Registry
-        if: startsWith(github.ref, 'refs/tags/')
-        run: |
-          docker build -t ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly .
-          docker tag ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:${GITHUB_REF:10}
-          docker tag ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:latest
-          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.GH_TOKEN }} ghcr.io
-          docker push ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:${GITHUB_REF:10}
-          docker push ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:latest
-
       - name: Build
         run: GIT_TAG_NAME=master-$GITHUB_RUN_NUMBER make build
 
@@ -52,3 +42,21 @@ jobs:
         uses: softprops/action-gh-release@v1
         with:
           files: target/hoverfly_bundle_*
+
+      - name: Publish to Registry
+        if: startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker build -t ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly .
+          docker tag ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:${GITHUB_REF:10}
+          docker tag ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:latest
+          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.GH_TOKEN }} ghcr.io
+          docker push ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:${GITHUB_REF:10}
+          docker push ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:latest
+
+      - name: Publish to Registry master tag
+        if: startsWith(github.ref, 'refs/heads/master')
+        run: |
+          docker build -t ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly .
+          docker tag ${{ secrets.DOCKER_IMAGE_USER }}/hoverfly ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:master
+          docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.GH_TOKEN }} ghcr.io
+          docker push ghcr.io/${{ secrets.DOCKER_IMAGE_USER }}/hoverfly:master

Dockerfile

@@ -1,11 +1,9 @@
-FROM golang:1.16.7 AS build-env
-WORKDIR /usr/local/go/src/github.com/SpectoLabs/hoverfly
-COPY . /usr/local/go/src/github.com/SpectoLabs/hoverfly
-RUN cd core/cmd/hoverfly && CGO_ENABLED=0 GOOS=linux go install -ldflags "-s -w"
-
 FROM alpine:latest
 RUN apk --no-cache add ca-certificates
-COPY --from=build-env /usr/local/go/bin/hoverfly /bin/hoverfly
+
+COPY target/bin/linux/amd64/hoverfly /bin/hoverfly
+COPY target/bin/linux/amd64/hoverctl /bin/hoverctl
+
 ENTRYPOINT ["/bin/hoverfly", "-listen-on-host=0.0.0.0"]
 CMD [""]
 

build-release.sh

@@ -27,5 +27,3 @@ for OSARCH in "${OSARCH_LIST[@]}"; do
   cp ${LICENSE} ${BIN_TARGET_DIR}/LICENSE.txt
   zip -j ${ZIP_FILE} ${BIN_TARGET_DIR}/*
 done
-
-rm -rf ${ZIP_TARGET_DIR}/bin

scripts/get_hoverfly_for_linux.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 
-HOVERFLY_VERSION=$(curl -s https://api.github.com/repos/spectolabs/hoverfly/releases/latest | grep tag_name | sed -n 's/.*"tag_name": "\(.*\)",/\1/p')
+HOVERFLY_VERSION=$(curl -s https://api.github.com/repos/MegafonWebLab/hoverfly/releases/latest | grep tag_name | sed -n 's/.*"tag_name": "\(.*\)",/\1/p')
 if [[ $?  == 1 ]]; then
     error_exit "Failed to get latest release version"
 fi
 
-HOVERFLY_DOWNLOAD_URL=https://github.com/SpectoLabs/hoverfly/releases/download/${HOVERFLY_VERSION}
+HOVERFLY_DOWNLOAD_URL=https://github.com/MegafonWebLab/hoverfly/releases/download/${HOVERFLY_VERSION}
 
 
 # Download distribution package for Linux