feat(build): make dev builds identical to release builds

SumoLogic · Jun 26, 2023 · be8fdbf · be8fdbf
1 parent 4f57d7f
commit be8fdbf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 63 deletions.
diff --git a/.github/workflows/dev_builds.yml b/.github/workflows/dev_builds.yml
@@ -153,7 +153,7 @@ jobs:
         if: matrix.arch_os == 'linux_amd64'
         run: |
           cp otelcol-sumo-fips-${{ matrix.arch_os }} otelcol-sumo
-          make build-push-container-multiplatform-dev \
+          make build-push-container-multiplatform \
             BUILD_TAG=${{ steps.extract_tag.outputs.tag }}-fips \
             PLATFORM=${{ matrix.arch_os }} \
             LATEST_TAG_FIPS_SUFFIX="-fips"
@@ -166,7 +166,7 @@ jobs:
       - name: Build and push image to Open Source ECR
         run: |
           cp otelcol-sumo-${{ matrix.arch_os }} otelcol-sumo
-          make build-push-container-multiplatform-dev \
+          make build-push-container-multiplatform \
             BUILD_TAG=${{ steps.extract_tag.outputs.tag }} \
             PLATFORM=${{ matrix.arch_os }}
 

diff --git a/Dockerfile_dev b/Dockerfile_dev
diff --git a/Makefile b/Makefile
@@ -254,30 +254,6 @@ build-container-dev:
 
 #-------------------------------------------------------------------------------
 
-# dev
-
-.PHONY: _build-container-multiplatform-dev
-_build-container-multiplatform-dev:
-	BUILD_TAG="$(BUILD_TAG)" \
-		REPO_URL="$(OPENSOURCE_REPO_URL_DEV)" \
-		DOCKERFILE="Dockerfile_dev" \
-		PLATFORM="$(PLATFORM)" \
-		./ci/build-push-multiplatform.sh $(PUSH)
-
-.PHONY: build-container-multiplatform-dev
-build-container-multiplatform-dev:
-	$(MAKE) _build-container-multiplatform-dev PUSH=
-
-.PHONY: build-container-multiplatform-dev
-build-push-container-multiplatform-dev:
-	$(MAKE) _build-container-multiplatform-dev PUSH=--push
-
-.PHONY: push-container-manifest-dev
-push-container-manifest-dev:
-	BUILD_TAG="$(BUILD_TAG)" \
-		REPO_URL="$(OPENSOURCE_REPO_URL_DEV)" \
-		./ci/push_docker_multiplatform_manifest.sh $(PLATFORMS)
-
 # release
 
 .PHONY: _build-container-multiplatform