Upstream pull

.github/workflows/docker_build_push.yaml

@@ -0,0 +1,125 @@
+---
+on:
+  push:
+    branches:
+      - '**'        # matches every branch
+    tags:
+      - '*'         # matches every tag that doesn't contain a '/'
+
+
+jobs:
+  build_and_push_image:
+    runs-on: self-hosted
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Prepare
+        id: prep
+        run: |
+          REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}')
+          REGISTRY_PATH="${{ secrets.ARTIFACTORY_URL }}/xmix-docker-dev/${REPOSITORY_NAME}"
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+            VERSION=pr-${{ github.event.number }}
+          fi
+          TAGS="${REGISTRY_PATH}:${VERSION}"
+          # TODO: Refine... was creating too many hashes
+          # if [ "${{ github.event_name }}" = "push" ]; then
+          #   TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
+          # fi
+          # if we pushed a tag, we also want publish a new latest image
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            TAGS="$TAGS,${REGISTRY_PATH}:latest"
+          fi
+          echo "TAGS to build and push are ${TAGS}"
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to Nuance JFrog Artifactory
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ secrets.ARTIFACTORY_URL }}
+          username: ${{ secrets.XMIX_PUBLISH_USERNAME }}
+          password: ${{ secrets.XMIX_PUBLISH_PASSWORD }}
+      -
+        name: Build and push to artifactory
+        uses: docker/build-push-action@v2
+        with:
+          build-args: VERSION=${{ steps.prep.outputs.version }}
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.html_url }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}
+
+  build_and_push_acrimage:
+    runs-on: self-hosted
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Prepare
+        id: prep
+        run: |
+          ACR_REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}')
+          ACR_REGISTRY_PATH="${{ secrets.DEVACR_URL }}/docker/base-images/${ACR_REPOSITORY_NAME}"
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/}
+          elif [[ $GITHUB_REF == refs/heads/* ]]; then
+            VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
+          elif [[ $GITHUB_REF == refs/pull/* ]]; then
+            VERSION=pr-${{ github.event.number }}
+          fi
+          TAGS="${ACR_REGISTRY_PATH}:${VERSION}"
+          # TODO: Refine... was creating too many hashes
+          # if [ "${{ github.event_name }}" = "push" ]; then
+          #   TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}"
+          # fi
+          # if we pushed a tag, we also want publish a new latest image
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            TAGS="$TAGS,${ACR_REGISTRY_PATH}:latest"
+          fi
+          echo "TAGS to build and push are ${TAGS}"
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to ACR Docker
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ secrets.DEVACR_URL }}
+          username: ${{ secrets.XMIX_DEVACR_USERNAME }}
+          password: ${{ secrets.XMIX_DEVACR_PASSWORD }}
+      -
+        name: Build and push to acr
+        uses: docker/build-push-action@v2
+        with:
+          build-args: VERSION=${{ steps.prep.outputs.version }}
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.html_url }}
+            org.opencontainers.image.created=${{ steps.prep.outputs.created }}
+            org.opencontainers.image.revision=${{ github.sha }}

Dockerfile

@@ -1,19 +1,22 @@
-FROM golang:1.15-alpine as builder
+
+FROM golang:1.20.4-alpine3.16 as builder
+
+ARG ${VERSION:-1.0.0}
 MAINTAINER FullStory Engineering
 
 # create non-privileged group and user
 RUN addgroup -S grpcurl && adduser -S grpcurl -G grpcurl
 
 WORKDIR /tmp/fullstorydev/grpcurl
 # copy just the files/sources we need to build grpcurl
-COPY VERSION *.go go.* /tmp/fullstorydev/grpcurl/
+COPY *.go go.* /tmp/fullstorydev/grpcurl/
 COPY cmd /tmp/fullstorydev/grpcurl/cmd
 # and build a completely static binary (so we can use
 # scratch as basis for the final image)
 ENV CGO_ENABLED=0
 ENV GO111MODULE=on
 RUN go build -o /grpcurl \
-    -ldflags "-w -extldflags \"-static\" -X \"main.version=$(cat VERSION)\"" \
+    -ldflags "-w -extldflags \"-static\" -X \"main.version=${VERSION}\"" \
     ./cmd/grpcurl
 
 # New FROM so we have a nice'n'tiny image

go.mod

@@ -1,14 +1,27 @@
 module github.com/fullstorydev/grpcurl
 
-go 1.15
+go 1.17
+
+require (
+	github.com/jhump/protoreflect v1.13.0
+	google.golang.org/grpc v1.50.0
+	google.golang.org/protobuf v1.30.0
+)
 
 require (
 	cloud.google.com/go v0.56.0 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.4.2
-	github.com/jhump/protoreflect v1.10.1
-	google.golang.org/grpc v1.37.0
-	google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
+	github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4 // indirect
+	github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
+	github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1 // indirect
+	github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/term v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/appengine v1.6.5 // indirect
+	google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e // indirect
 )