gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-08 12:56:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.github/workflows/publish-docker.yml vendored
View file

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

2
Dockerfile
View file

@ -7,7 +7,7 @@ COPY . .
ENV GO111MODULE=auto ENV GO111MODULE=auto
RUN apk add git 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 # RUN go build -tags=ee . -o netmaker main.go
FROM alpine:3.16.2 FROM alpine:3.16.2