Merge the Dockerfiles, add nfd-autoreg target
Refs: #5303
Change-Id: I1f1babbb38cfc702218f844d30b81914ca5c274f
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 53554df..d21badd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -46,18 +46,19 @@
uses: docker/build-push-action@v5
with:
context: .
+ target: nfd
pull: true
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
nfd-status-http-server:
- needs: nfd
runs-on: ubuntu-latest
-
steps:
- name: Checkout repository
uses: actions/checkout@v4
+ with:
+ submodules: true
- name: Login to ${{ env.REGISTRY }}
uses: docker/login-action@v3
@@ -76,8 +77,8 @@
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
- context: ./tools
- file: ./tools/Dockerfile.nfd-status-http-server
+ context: .
+ target: nfd-status-http-server
pull: true
push: true
tags: ${{ steps.meta.outputs.tags }}