testing docker action

Signed-off-by: Justin Kolberg <[email protected]>
SumoLogic · Sep 25, 2023 · fd4f532 · fd4f532
1 parent c6b9114
commit fd4f532
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ci/build-fips-action/Dockerfile b/ci/build-fips-action/Dockerfile
@@ -10,6 +10,6 @@ RUN curl -Lo go.tar.gz https://go.dev/dl/go1.20.5.linux-$TARGETARCH.tar.gz
 RUN tar -zxvf go.tar.gz -C /usr/local
 ENV PATH="/usr/local/go/bin:${PATH}"
 
-COPY ./ci/build-fips-action/entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/ci/build-fips-action/entrypoint.sh b/ci/build-fips-action/entrypoint.sh
@@ -4,7 +4,7 @@ git config --global --add safe.directory /github/workspace
 
 echo "HERE"
 
-ls -l
+ls -la
 
 # Install builder
 #cd otelcolbuilder || exit 1

diff --git a/otelcolbuilder/Makefile b/otelcolbuilder/Makefile
@@ -136,8 +136,8 @@ build-debug: ensure-correct-builder-version
 
 .PHONY: build-fips
 build-fips:
-	docker build --platform linux/amd64	-t otelcol-sumo-builder-fips -f ../ci/build-fips-action/Dockerfile ../
-	docker run --platform linux/amd64 --rm -v $(PWD)/../:/github/workspace -w /github/workspace --tmpfs /tmp otelcol-sumo-builder-fips
+	docker build --platform linux/amd64	-t otelcol-sumo-builder-fips -f ../ci/build-fips-action/Dockerfile ../ci/build-fips-action
+	docker run -it --platform linux/amd64 --rm -v $(PWD)/../:/github/workspace -w /github/workspace --tmpfs /tmp otelcol-sumo-builder-fips
 
 .PHONY: generate-sources
 generate-sources:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ git config --global --add safe.directory /github/workspace @@
     echo "HERE"
-    ls -l
+    ls -la
     # Install builder
     #cd otelcolbuilder || exit 1
@@ Expand Down @@