From c09ee2403840bd236e27e6e0fd8e7b7a1641cdb1 Mon Sep 17 00:00:00 2001 From: bedaberner <49646807+bedaberner@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:20:08 +0200 Subject: [PATCH 1/6] Create docker-publish.yml --- .github/workflows/docker-publish.yml | 58 ++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/docker-publish.yml diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 000000000..1930dc3dc --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,58 @@ +name: Build and Publish Docker Image + +on: + push: + branches: [ "main", "master" ] + tags: [ 'v*' ] + pull_request: + branches: [ "main", "master" ] + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + with: + submodules: true + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Log in to the Container registry + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + type=ref,event=branch + type=ref,event=pr + type=sha + type=raw,value=latest,enable={{is_default_branch}} + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + cache-from: type=gha + cache-to: type=gha,mode=max From 71fe715f942beb4aa45c1256dfcdb93697f24ef7 Mon Sep 17 00:00:00 2001 From: bedaberner <49646807+bedaberner@users.noreply.github.com> Date: Wed, 23 Apr 2025 14:24:27 +0200 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b5ec600a6..fcb8b1c62 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,28 @@ -FROM node:12 +FROM node:20 # Create app directory WORKDIR /usr/src/app -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -# where available (npm@5+) +# Install git (needed for submodules) +RUN apt-get update && apt-get install -y git + +# Copy package files first for better caching COPY package*.json ./ +# Install dependencies RUN npm install # Bundle app source COPY . . +# Initialize and update git submodules +RUN git init +RUN git config --global url."https://github.com/".insteadOf git@github.com: +RUN git submodule init +RUN git submodule update + +# Run the update-browserslist-db as suggested in the warning +RUN npx update-browserslist-db@latest + EXPOSE 8080 -CMD [ "npm", "run", "dev" ] \ No newline at end of file +CMD [ "npm", "run", "dev" ] From 8fbf9f51747ee0e6aa6ac80eae7226a6d0f91402 Mon Sep 17 00:00:00 2001 From: bedaberner <49646807+bedaberner@users.noreply.github.com> Date: Wed, 23 Apr 2025 15:25:07 +0200 Subject: [PATCH 3/6] Update Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fcb8b1c62..89d106080 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,6 @@ COPY . . # Initialize and update git submodules RUN git init -RUN git config --global url."https://github.com/".insteadOf git@github.com: RUN git submodule init RUN git submodule update From 96361a64949e8ff3b2cbbd1052968459b7a9b276 Mon Sep 17 00:00:00 2001 From: bedaberner <49646807+bedaberner@users.noreply.github.com> Date: Wed, 23 Apr 2025 16:03:38 +0200 Subject: [PATCH 4/6] Update README.md to include prebuilt docker image --- README.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8577fc223..b8cd888aa 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,15 @@ npm test # Docker +run the prebuilt docker image: + +``` bash +docker run -p 8080:8080 -d ghcr.io/ArduPilot/UAVLogViewer:latest + +``` + +or build the docker file locally: + ``` bash # Build Docker Image @@ -45,4 +54,4 @@ docker logs # Navigate to localhost:8080 in your web browser -``` \ No newline at end of file +``` From 933c7fd05b6af384896cc80dc359e296e7cddbef Mon Sep 17 00:00:00 2001 From: bedaberner <49646807+bedaberner@users.noreply.github.com> Date: Wed, 23 Apr 2025 16:13:50 +0200 Subject: [PATCH 5/6] Fix Import error --- src/components/CesiumViewer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CesiumViewer.vue b/src/components/CesiumViewer.vue index b41e0352e..97b4b70fc 100644 --- a/src/components/CesiumViewer.vue +++ b/src/components/CesiumViewer.vue @@ -70,7 +70,7 @@ import tzlookup from 'tz-lookup' import { store } from './Globals.js' import { DataflashDataExtractor } from '../tools/dataflashDataExtractor' import { MavlinkDataExtractor } from '../tools/mavlinkDataExtractor' -import { djiDataExtractor } from '../tools/djiDataExtractor' +import { DjiDataExtractor } from '../tools/djiDataExtractor' import 'cesium/Build/Cesium/Widgets/widgets.css' import CesiumSettingsWidget from './widgets/CesiumSettingsWidget.vue' import ColorCoderMode from './cesiumExtra/colorCoderMode.js' From 66e040b4985fd40f0f481c5dbfe2ebeaac450251 Mon Sep 17 00:00:00 2001 From: bedaberner <49646807+bedaberner@users.noreply.github.com> Date: Wed, 23 Apr 2025 16:37:44 +0200 Subject: [PATCH 6/6] fixed DjiDataExtractor capitalization --- src/components/CesiumViewer.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/CesiumViewer.vue b/src/components/CesiumViewer.vue index 97b4b70fc..2763a5571 100644 --- a/src/components/CesiumViewer.vue +++ b/src/components/CesiumViewer.vue @@ -1367,7 +1367,7 @@ export default { dataExtractor = MavlinkDataExtractor } else if (this.state.logType === 'dji') { console.log('Using DJI extractor') - dataExtractor = djiDataExtractor + dataExtractor = DjiDataExtractor } else { dataExtractor = DataflashDataExtractor }