gd

ArduPilot · Dec 4, 2023 · 1e1571e · 1e1571e
1 parent 5c1e88b
commit 1e1571e
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 10 deletions.
diff --git a/.github/workflows/build_and_push.yml b/.github/workflows/build_and_push.yml
@@ -190,6 +190,7 @@ jobs:
           file: docker/Dockerfile_dev-${{matrix.config}}
           tags: ${{ steps.prep.outputs.tags }}
           push: ${{ github.event_name != 'pull_request' }}
+          build-args: "TAG=${{ steps.prep.outputs.version }}"
           pull: false
           labels: |
             org.opencontainers.image.title=${{ steps.prep.outputs.img_name }}
@@ -293,13 +294,14 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: ReBuild ardupilot-dev-base image from cache
+      - name: ReBuild ardupilot-dev-armhf image from cache
         if: github.event_name == 'pull_request' && ${{matrix.config}} == "armhf-musl"
         uses: docker/build-push-action@v5
         with:
           context: ./
           file: docker/Dockerfile_dev-armhf
           tags: ardupilot/ardupilot-dev-armhf:${{ steps.prep.outputs.version }},ardupilot/ardupilot-dev-armhf:latest
+          build-args: "TAG=${{ steps.prep.outputs.version }}"
           push: false
           load: true
           labels: |
@@ -316,13 +318,14 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: ReBuild ardupilot-dev-base image from cache
+      - name: ReBuild ardupilot-dev-coverage image from cache
         if: github.event_name == 'pull_request' && ${{matrix.config}} == "periph"
         uses: docker/build-push-action@v5
         with:
           context: ./
           file: docker/Dockerfile_dev-coverage
           tags: ardupilot/ardupilot-dev-coverage:${{ steps.prep.outputs.version }},ardupilot/ardupilot-dev-coverage:latest
+          build-args: "TAG=${{ steps.prep.outputs.version }}"
           push: false
           load: true
           labels: |
@@ -358,6 +361,7 @@ jobs:
           context: ./
           file: docker/Dockerfile_dev-${{matrix.config}}
           tags: ${{ steps.prep.outputs.tags }}
+          build-args: "TAG=${{ steps.prep.outputs.version }}"
           push: ${{ github.event_name != 'pull_request' }}
           pull: false
           labels: |

diff --git a/docker/Dockerfile_dev-aarch64 b/docker/Dockerfile_dev-aarch64
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-base:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-base:${TAG}
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     g++-aarch64-linux-gnu \

diff --git a/docker/Dockerfile_dev-armhf b/docker/Dockerfile_dev-armhf
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-base:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-base:${TAG}
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     g++-arm-linux-gnueabihf \

diff --git a/docker/Dockerfile_dev-armhf-musl b/docker/Dockerfile_dev-armhf-musl
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-armhf:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-armhf:${TAG}
 
 # Get ArduPilot MUSL ARM toolchain
 ARG MUSL_ROOT="arm-linux-musleabihf-cross"

diff --git a/docker/Dockerfile_dev-chibios b/docker/Dockerfile_dev-chibios
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-base:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-base:${TAG}
 
 # Get ArduPilot STM32 toolchain
 ARG ARM_ROOT="gcc-arm-none-eabi-10"

diff --git a/docker/Dockerfile_dev-chibios-clang b/docker/Dockerfile_dev-chibios-clang
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-chibios:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-chibios:${TAG}
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     clang-14 \

diff --git a/docker/Dockerfile_dev-clang b/docker/Dockerfile_dev-clang
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-base:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-base:${TAG}
 ENV CLANG_VERSION=14
 
 RUN apt-get update && apt-get install --no-install-recommends -y \

diff --git a/docker/Dockerfile_dev-coverage b/docker/Dockerfile_dev-coverage
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-base:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-base:${TAG}
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
     lcov \

diff --git a/docker/Dockerfile_dev-periph b/docker/Dockerfile_dev-periph
@@ -1,5 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ardupilot/ardupilot-dev-coverage:latest
+ARG TAG="latest"
+FROM ardupilot/ardupilot-dev-coverage:${TAG}
 
 RUN apt-get update && dpkg --add-architecture i386 \
     && apt-get update \