Browse Source

Merge pull request #1847 from gravitl/hotfix_publish_docker

Update publish-docker.yml
dcarns 2 years ago
parent
commit
15ff1c8868
2 changed files with 2 additions and 2 deletions
  1. 1 1
      .github/workflows/publish-docker.yml
  2. 1 1
      Dockerfile

+ 1 - 1
.github/workflows/publish-docker.yml

@@ -47,7 +47,7 @@ jobs:
           platforms: linux/amd64, linux/arm64, linux/arm/v7
           platforms: linux/amd64, linux/arm64, linux/arm/v7
           push: true
           push: true
           tags: ${{ github.repository }}:${{ env.TAG }}, ${{ github.repository }}:latest
           tags: ${{ github.repository }}:${{ env.TAG }}, ${{ github.repository }}:latest
-          build-args: version=${{ env.TAG }}
+          build-args: version=${{ env.TAG }}, tags="-tags=ce"
 
 
   docker-ee:
   docker-ee:
     runs-on: ubuntu-latest
     runs-on: ubuntu-latest

+ 1 - 1
Dockerfile

@@ -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 -ldflags="-s -X 'main.version=${version}'" ${tags} .
 # 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