diff --git a/.github/workflows/image_publishing.yml b/.github/workflows/image_publishing.yml index 800b5cb..27e4166 100644 --- a/.github/workflows/image_publishing.yml +++ b/.github/workflows/image_publishing.yml @@ -36,7 +36,7 @@ jobs: uses: docker/build-push-action@v5 with: context: . - file: Image.Dockerfile + file: Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} platforms: linux/amd64,linux/arm64 diff --git a/Action.Dockerfile b/Action.Dockerfile deleted file mode 100644 index 519d234..0000000 --- a/Action.Dockerfile +++ /dev/null @@ -1 +0,0 @@ -FROM sergeyladanov/nrf-connect-sdk:v2.4.2 diff --git a/Image.Dockerfile b/Dockerfile similarity index 96% rename from Image.Dockerfile rename to Dockerfile index 6e7e08e..b4bdfcb 100644 --- a/Image.Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ FROM debian:stable-slim #ARG ARCH=amd64 -ARG NRF_CONNECT_TAG=v2.4.2 +ARG NRF_CONNECT_TAG=v2.3.0 # Should be for selected NRF_CONNECT_TAG -ARG ZEPHYR_NEEDED_TAG=0.16.0 +ARG ZEPHYR_NEEDED_TAG=0.15.2 # For new versions - xz -ARG ZEPHYR_ARCHIVE_EXTENSION=xz +ARG ZEPHYR_ARCHIVE_EXTENSION=gz # For entrypoint file ENV ZEPHYR_TAG=$ZEPHYR_NEEDED_TAG diff --git a/README.md b/README.md index 4e0eb50..6f66138 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,10 @@ To select the specific version of NRF Connect SDK you can reference a specific version of GitHub action: ``` uses: embedd-actions/nrf-connect-sdk-ci@v2.3.0 -uses: embedd-actions/nrf-connect-sdk-ci@v2.4.0 ``` ## List of available tags ``` v2.3.0 -v2.4.0 -v2.4.1 -v2.4.2 ``` diff --git a/action.yml b/action.yml index 17bcdcf..39931e9 100644 --- a/action.yml +++ b/action.yml @@ -10,7 +10,7 @@ inputs: default: 'build' runs: using: 'docker' - image: 'Action.Dockerfile' + image: 'docker://sergeyladanov/nrf-connect-sdk:v2.3.0' args: - west - build diff --git a/docker-compose.yml b/docker-compose.yml index a01f85b..7e79ce0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: container_name: nrf build: context: . - dockerfile: Image.Dockerfile + dockerfile: Dockerfile args: - NRF_CONNECT_TAG=v2.3.0 - ZEPHYR_NEEDED_TAG=0.15.2