From 00579e544985ceae37ef67fc8d21d2c5ecd21663 Mon Sep 17 00:00:00 2001 From: Frank Delporte Date: Tue, 6 Feb 2024 11:31:54 +0100 Subject: [PATCH] cleanup --- .github/workflows/ci.yml | 12 ++++-------- README.md | 26 -------------------------- 2 files changed, 4 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4851d4a..a250ed4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: pi4j-builder-base: name: Build `pi4j-builder-base` runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - name: Login to Docker Hub @@ -25,18 +26,12 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Set up QEMU - uses: docker/setup-qemu-action@v1 -# - name: Set up Docker Buildx -# id: buildx -# uses: docker/setup-buildx-action@v1 -# - name: Builder instance name -# run: echo ${{ steps.buildx.outputs.name }} -# - name: Available platforms -# run: echo ${{ steps.buildx.outputs.platforms }} + uses: docker/setup-qemu-action@v1 - name: Build image for `pi4j-builder-base` run: | cd pi4j-builder-base ./build.sh --push + pi4j-builder-native: needs: [pi4j-builder-base] name: Build `pi4j-builder-native` @@ -54,6 +49,7 @@ jobs: run: | cd pi4j-builder-native ./build.sh --push + pi4j-builder-2_0: needs: [pi4j-builder-base,pi4j-builder-native] name: Build `pi4j-builder-2.0` diff --git a/README.md b/README.md index ba15d54..c9f2c5a 100644 --- a/README.md +++ b/README.md @@ -28,32 +28,6 @@ include the following: **Note:** Pi4J versions prior to v2.0 are not supported in these Docker images. ---- -### Prerequisites: -``` -#----------------------------------------------------------------------------------------- -# !! THIS DOCKER BUILD REQUIRES THE EXPERIMENTAL DOCKER BUILDX PLUGIN !! -#----------------------------------------------------------------------------------------- -# -# REF: https://docs.docker.com/buildx/working-with-buildx/ -# -# Docker Buildx is a CLI plugin that extends the docker command with the -# full support of the features provided by Moby BuildKit builder toolkit. -# It provides the same user experience as docker build with many new -# features like creating scoped builder instances and building against -# multiple nodes concurrently. -# -# This is an experimental feature. -# -# Experimental features provide early access to future product functionality. -# These features are intended for testing and feedback only as they may change -# between releases without warning or can be removed entirely from a future -# release. Experimental features must not be used in production environments. -# Docker does not offer support for experimental features. -# -#----------------------------------------------------------------------------------------- -``` ---- ### How to Build the Pi4J Project using these Docker Images: #### Build Pi4J v2.0