Skip to content

Commit

Permalink
Merge pull request #391 from jmarrero/use-containerfile
Browse files Browse the repository at this point in the history
ci: use Containerfile instead of Dockerfile
  • Loading branch information
cgwalters authored Oct 27, 2022
2 parents 64af26c + b5df5bc commit 3d7277d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions ci/container-build-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 3d7277d

Please sign in to comment.