From fd4f532d3f364a70c530ba0daf765b29317b22aa Mon Sep 17 00:00:00 2001 From: Justin Kolberg Date: Mon, 25 Sep 2023 12:59:43 -0700 Subject: [PATCH] testing docker action Signed-off-by: Justin Kolberg --- ci/build-fips-action/Dockerfile | 2 +- ci/build-fips-action/entrypoint.sh | 2 +- otelcolbuilder/Makefile | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/build-fips-action/Dockerfile b/ci/build-fips-action/Dockerfile index 5ef790b9c4..d238cbe64b 100644 --- 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 index e7aae3753c..67c6cd718c 100755 --- 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 index d6f5500e71..e6df0b2a13 100644 --- 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: