Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 85 additions & 0 deletions .github/workflows/docker-gpu.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: Docker GPU Image

on:
push:
branches:
- master
tags:
- v*
# Limited to the paths that can break these images and are not covered by
# the CPU image's PR build.
pull_request:
paths:
- Dockerfile.gpu
- Dockerfile.gpu.intel
- install_deps.sh
- node.sh
- .github/workflows/docker-gpu.yaml
workflow_dispatch:

permissions:
contents: read
id-token: write

concurrency:
group: docker-gpu-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
gpu:
uses: docker/github-builder/.github/workflows/build.yml@v1
with:
output: image
# Only refs that produce tags may push: a workflow_dispatch on any other
# branch would otherwise push untagged digests and then fail.
push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
file: ./Dockerfile.gpu
platforms: linux/amd64
set-meta-labels: true
meta-images: opendronemap/nodeodm
meta-flavor: |
latest=false
suffix=-gpu
# :edge-gpu on master; :<version>-gpu and :gpu on a v* tag. The '-'
# guard keeps prereleases (v3.7.0-rc1) off :gpu.
meta-tags: |
type=edge,branch=master
type=semver,pattern={{version}}
type=ref,event=pr
type=raw,value=gpu,suffix=,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}
secrets:
registry-auths: |
- registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

# The Intel image layers OpenCL packages on the GPU image built above, so it
# builds from that image's digest rather than racing the :gpu tag. It only
# runs on refs that pushed a GPU image.
gpu-intel:
needs: gpu
if: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
uses: docker/github-builder/.github/workflows/build.yml@v1
with:
output: image
push: true
file: ./Dockerfile.gpu.intel
platforms: linux/amd64
build-args: |
FROM_REPO=opendronemap/nodeodm@${{ needs.gpu.outputs.digest }}
set-meta-labels: true
meta-images: opendronemap/nodeodm
meta-flavor: |
latest=false
suffix=-gpu-intel
# :edge-gpu-intel on master; :<version>-gpu-intel and :gpu-intel on a
# v* tag. The pre-3.6.2 :gpu.intel spelling is not carried forward.
meta-tags: |
type=edge,branch=master
type=semver,pattern={{version}}
type=raw,value=gpu-intel,suffix=,enable=${{ startsWith(github.ref, 'refs/tags/v') && !contains(github.ref, '-') }}
secrets:
registry-auths: |
- registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
44 changes: 44 additions & 0 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Docker CPU Image

on:
push:
branches:
- master
tags:
- v*
pull_request:
workflow_dispatch:

permissions:
contents: read
id-token: write

concurrency:
group: docker-cpu-${{ github.ref }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

jobs:
cpu:
uses: docker/github-builder/.github/workflows/build.yml@v1
with:
output: image
# Only refs that produce tags may push: a workflow_dispatch on any other
# branch would otherwise push untagged digests and then fail.
push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') }}
file: ./Dockerfile
platforms: |
linux/amd64
linux/arm64
set-meta-labels: true
meta-images: opendronemap/nodeodm
# :edge on master; :<version> and :latest on a v* tag (latest=auto
# skips prereleases such as v3.7.0-rc1).
meta-tags: |
type=edge,branch=master
type=semver,pattern={{version}}
type=ref,event=pr
secrets:
registry-auths: |
- registry: docker.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
44 changes: 0 additions & 44 deletions .github/workflows/publish-docker-gpu-intel.yaml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/publish-docker-gpu.yaml

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/publish-docker.yaml

This file was deleted.

12 changes: 10 additions & 2 deletions .github/workflows/publish-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,21 @@ permissions:
contents: write
id-token: write

# Let a tagged release build run to completion instead of being superseded by a
# later push to the same ref. Different refs (master vs. a tag) never contend.
concurrency:
group: publish-windows-${{ github.ref }}
cancel-in-progress: false

jobs:
build:
runs-on: windows-latest
environment: azuresigning
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v6
- name: Setup NodeJS
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '14'
- name: Setup Env
Expand All @@ -43,10 +49,12 @@ jobs:
npm run winbundle -- --signtool-path "C:\Program Files (x86)\Windows Kits\10\bin\10.0.26100.0\x64\signtool.exe" --azure-signing-metadata "%RUNNER_TEMP%\metadata.json"
shell: cmd
- name: Upload Bundle File
if: always()
uses: actions/upload-artifact@v4
with:
name: Bundle
path: dist\*.zip
retention-days: 3
- name: Upload Bundle to Release
uses: svenstaro/upload-release-action@v2
if: startsWith(github.ref, 'refs/tags/')
Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/test-build-prs.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM opendronemap/odm:3.5.6
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
FROM opendronemap/odm:3.6.2
LABEL org.opencontainers.image.authors="OpenDroneMap Developers <maintainers@opendronemap.org>"

EXPOSE 3000

Expand Down
12 changes: 6 additions & 6 deletions Dockerfile.gpu
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG FROM_REPO=opendronemap/odm:gpu
ARG FROM_REPO=opendronemap/odm:3.6.2-gpu
FROM ${FROM_REPO}
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
LABEL org.opencontainers.image.authors="OpenDroneMap Developers <maintainers@opendronemap.org>"

EXPOSE 3000

Expand All @@ -19,15 +19,15 @@ RUN bash install_deps.sh && \
ln -s /code/SuperBuild/install/bin/untwine /usr/bin/untwine && \
ln -s /code/SuperBuild/install/bin/entwine /usr/bin/entwine && \
ln -s /code/SuperBuild/install/bin/pdal /usr/bin/pdal && \
ln -s /var/www/node.sh /usr/bin/node && \
mkdir -p tmp && node index.js --powercycle

RUN echo /usr/local/cuda-11.2/compat >> /etc/ld.so.conf.d/989_cuda-11.conf && ldconfig
ln -s /var/www/node.sh /usr/bin/node

RUN useradd -m -d "/home/odm" -s /bin/bash odm && \
chown -R odm:odm /var/www && \
chown -R odm:odm /code

USER odm

# Smoke test as the runtime user, with the command ENTRYPOINT runs.
RUN mkdir -p tmp && /usr/bin/node /var/www/index.js --powercycle

ENTRYPOINT ["/usr/bin/node", "/var/www/index.js"]
3 changes: 2 additions & 1 deletion Dockerfile.gpu.intel
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM opendronemap/nodeodm:gpu
ARG FROM_REPO=opendronemap/nodeodm:gpu
FROM ${FROM_REPO}

EXPOSE 3000

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "NodeODM",
"version": "2.2.4",
"version": "3.6.2",
"description": "REST API to access ODM",
"main": "index.js",
"scripts": {
Expand Down
Loading