Use default Dockerfile args on pipelines for both Base and Gostatsd i…

…mages (#86)
newrelic · Aug 8, 2024 · 13951ec · 13951ec
1 parent c6f86e3
commit 13951ec
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 27 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -7,8 +7,6 @@ on:
       - master
 
 env:
-  BASE_IMAGE_TAG: 3.19.1
-  GOSTATSD_TAG: 36.0.2
   SNYK_TOKEN: ${{ secrets.CAOS_SNYK_TOKEN }}
   TEST_IMAGE: "newrelic/nri-statsd:nightly"
   DOCKER_IMAGE_TAG: "nightly"
@@ -28,7 +26,7 @@ jobs:
 
       - name: Build image
         run: |
-          make build/docker-amd64 BASE_IMAGE_TAG=${{ env.BASE_IMAGE_TAG }} GOSTATSD_TAG=${{ env.GOSTATSD_TAG }} DOCKER_IMAGE_TAG=${{ env.DOCKER_IMAGE_TAG }}
+          make build/docker-amd64 DOCKER_IMAGE_TAG=${{ env.DOCKER_IMAGE_TAG }}
 
       - name: Run Snyk to check Docker image for vulnerabilities
         uses: snyk/actions/docker@master

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -8,10 +8,6 @@ on:
     tags:
       - '*'
 
-env:
-  BASE_IMAGE_TAG: 3.19.1
-  GOSTATSD_TAG: 36.0.2
-
 jobs:
   push_to_registry:
     runs-on: ubuntu-latest
@@ -35,9 +31,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           platforms: linux/amd64,linux/arm64
-          build-args: |
-            BASE_IMAGE_TAG=${{ env.BASE_IMAGE_TAG }}
-            GOSTATSD_TAG=${{ env.GOSTATSD_TAG }}
           context: .
           push: true
           tags: |

diff --git a/.github/workflows/security.yaml b/.github/workflows/security.yaml
@@ -10,8 +10,6 @@ on:
       - README.md
 
 env:
-  BASE_IMAGE_TAG: 3.19.1
-  GOSTATSD_TAG: 36.0.2
   SNYK_TOKEN: ${{ secrets.CAOS_SNYK_TOKEN }}
   TEST_IMAGE: "newrelic/nri-statsd:test"
 
@@ -30,7 +28,7 @@ jobs:
 
       - name: Build image
         run: |
-          make build/docker-amd64 BASE_IMAGE_TAG=${{ env.BASE_IMAGE_TAG }} GOSTATSD_TAG=${{ env.GOSTATSD_TAG }}
+          make build/docker-amd64
 
       - name: Run Snyk to check Docker image for vulnerabilities
         uses: snyk/actions/docker@master

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -9,10 +9,6 @@ on:
     paths-ignore:
       - README.md
 
-env:
-  BASE_IMAGE_TAG: 3.19.1
-  GOSTATSD_TAG: 36.0.2
-
 jobs:
   test:
     name: Integration tests
@@ -36,4 +32,4 @@ jobs:
 
       - name: Running integration tests
         run: |
-          make integration-tests-${{ matrix.arch }} BASE_IMAGE_TAG=${{ env.BASE_IMAGE_TAG }} GOSTATSD_TAG=${{ env.GOSTATSD_TAG }}
+          make integration-tests-${{ matrix.arch }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,6 @@
-ARG BASE_IMAGE_TAG=3.20.2
-ARG GOSTATSD_TAG=36.0.2
+FROM atlassianlabs/gostatsd:36.0.2 as gostatsd
 
-FROM atlassianlabs/gostatsd:$GOSTATSD_TAG as gostatsd
-
-FROM alpine:$BASE_IMAGE_TAG
+FROM alpine:3.20.2
 
 RUN apk --no-cache add \
     ca-certificates file

diff --git a/Makefile b/Makefile
@@ -1,15 +1,11 @@
 PROJECT_WORKSPACE	?= $(CURDIR)
 DOCKER_IMAGE_NAME	?= newrelic/nri-statsd
 DOCKER_IMAGE_TAG	?= test
-GOSTATSD_TAG		?= 36.0.2
-BASE_IMAGE_TAG		?= 3.19
 TEST_IMAGE_TAG		?= 1.22.2-alpine3.19
 
 DOCKER_BUILD_CMD	?= docker build --pull \
 					--no-cache \
 					-t $(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG) \
-					--build-arg BASE_IMAGE_TAG=$(BASE_IMAGE_TAG) \
-					--build-arg GOSTATSD_TAG=$(GOSTATSD_TAG) \
 					.
 
 DOCKER_TEST_CMD		?= docker run -i \