Merge pull request #1781 from gravitl/hotfix_v0.17.0_workflows

Hotfix v0.17.0 workflows
This commit is contained in:
dcarns 2022-12-01 10:00:20 -05:00 committed by GitHub
commit e07cf39fb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 15 deletions

View file

@ -13,7 +13,7 @@ jobs:
docker:
runs-on: ubuntu-latest
steps:
-
-
name: Set tag
run: |
if [[ -n "${{ github.event.inputs.tag }}" ]]; then
@ -24,16 +24,16 @@ jobs:
TAG="${{ github.ref_name }}"
fi
echo "TAG=${TAG}" >> $GITHUB_ENV
-
-
name: Checkout
uses: actions/checkout@v3
-
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
-
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
-
name: Login to DockerHub
uses: docker/login-action@v2
with:
@ -52,27 +52,27 @@ jobs:
docker-ee:
runs-on: ubuntu-latest
steps:
-
-
name: Set tag
run: |
if [[ -n "${{ github.event.inputs.tag }}" ]]; then
docker/build-push-action@v3.tag }}
TAG=${{ github.event.inputs.tag }}
elif [[ "${{ github.ref_name }}" == 'master' ]]; then
TAG="latest"
else
TAG="${{ github.ref_name }}"
fi
echo "TAG=${TAG}" >> $GITHUB_ENV
-
-
name: Checkout
uses: actions/checkout@v3
-
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
-
-
name: Set up Docker Buildx
uses: docker/build-push-action@v3
-
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
uses: docker/login-action@v2
with:
@ -83,7 +83,9 @@ jobs:
uses: docker/build-push-action@v3
with:
context: .
platforms: linux/amd64, linux/arm64, linux/arm/v7
platforms: linux/amd64, linux/arm64
push: true
tags: ${{ github.repository }}:${{ env.TAG }}-ee
build-args: version=${{ env.TAG }}, tags="-tags=ee"
build-args: |
version=${{ env.TAG }}
tags=ee

View file

@ -7,7 +7,7 @@ COPY . .
ENV GO111MODULE=auto
RUN apk add git
RUN GOOS=linux CGO_ENABLED=1 go build ${tags} -ldflags="-s -X 'main.version=${version}'" .
RUN GOOS=linux CGO_ENABLED=1 go build -tags ${tags} -ldflags="-s -X 'main.version=${version}'" .
# RUN go build -tags=ee . -o netmaker main.go
FROM alpine:3.16.2