From b5df5bc482ce7cbb452dc0b260f5e828e2203fe5 Mon Sep 17 00:00:00 2001 From: Joseph Marrero Date: Thu, 27 Oct 2022 15:37:21 -0400 Subject: [PATCH] ci: use Containerfile instead of Dockerfile --- ci/container-build-integration.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/container-build-integration.sh b/ci/container-build-integration.sh index a3741b36..7877a863 100755 --- a/ci/container-build-integration.sh +++ b/ci/container-build-integration.sh @@ -10,23 +10,23 @@ chmod a+x ostree-ext-cli workdir=${PWD} cd ${example} cp ${workdir}/ostree-ext-cli . -sed -ie 's,ostree container commit,ostree-ext-cli container commit,' Dockerfile -sed -ie 's,^\(FROM .*\),\1\nADD ostree-ext-cli /usr/bin/,' Dockerfile +sed -ie 's,ostree container commit,ostree-ext-cli container commit,' Containerfile +sed -ie 's,^\(FROM .*\),\1\nADD ostree-ext-cli /usr/bin/,' Containerfile git diff for runtime in podman docker; do - $runtime build -t localhost/fcos-tailscale . + $runtime build -t localhost/fcos-tailscale -f Containerfile . $runtime run --rm localhost/fcos-tailscale rpm -q tailscale done cd $(mktemp -d) cp ${workdir}/ostree-ext-cli . -cat > Dockerfile << EOF +cat > Containerfile << EOF FROM $image ADD ostree-ext-cli /usr/bin/ RUN set -x; test \$(ostree-ext-cli internal-only-for-testing detect-env) = ostree-container EOF # Also verify docker buildx, which apparently doesn't have /.dockerenv -docker buildx build -t localhost/fcos-tailscale . +docker buildx build -t localhost/fcos-tailscale -f Containerfile . echo ok container image integration