Skip to content

Commit ca0a43c

Browse files
author
Turker Teke
committed
merge upstream
2 parents 7c228f6 + 6b61238 commit ca0a43c

59 files changed

Lines changed: 2516 additions & 858 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.dockerignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
node_modules
22
tests
33
tmp
4+
nodeodm.exe
5+
dist

‎.github/workflows/publish-docker-gpu-intel.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Publish Docker Intel GPU
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*
9+
10+
# Triggered by ODM build (after docker push)
11+
workflow_dispatch:
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
- name: Set up QEMU
20+
uses: docker/setup-qemu-action@v1
21+
- name: Set up Docker Buildx
22+
uses: docker/setup-buildx-action@v1
23+
- name: Login to DockerHub
24+
uses: docker/login-action@v1
25+
with:
26+
username: ${{ secrets.DOCKERHUB_USERNAME }}
27+
password: ${{ secrets.DOCKERHUB_TOKEN }}
28+
# Use the repository information of the checked-out code to format docker tags
29+
- name: Docker meta
30+
id: docker_meta
31+
uses: crazy-max/ghaction-docker-meta@v1
32+
with:
33+
images: opendronemap/nodeodm
34+
tag-semver: |
35+
{{version}}
36+
- name: Build and push Docker image
37+
id: docker_build
38+
uses: docker/build-push-action@v2
39+
with:
40+
file: ./Dockerfile.gpu.intel
41+
platforms: linux/amd64
42+
push: true
43+
tags: |
44+
opendronemap/nodeodm:gpu.intel

‎.github/workflows/publish-docker-gpu.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Publish Docker GPU
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*
9+
10+
# Triggered by ODM build (after docker push)
11+
workflow_dispatch:
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
- name: Set up QEMU
20+
uses: docker/setup-qemu-action@v1
21+
- name: Set up Docker Buildx
22+
uses: docker/setup-buildx-action@v1
23+
- name: Login to DockerHub
24+
uses: docker/login-action@v1
25+
with:
26+
username: ${{ secrets.DOCKERHUB_USERNAME }}
27+
password: ${{ secrets.DOCKERHUB_TOKEN }}
28+
# Use the repository information of the checked-out code to format docker tags
29+
- name: Docker meta
30+
id: docker_meta
31+
uses: crazy-max/ghaction-docker-meta@v1
32+
with:
33+
images: opendronemap/nodeodm
34+
tag-semver: |
35+
{{version}}
36+
- name: Build and push Docker image
37+
id: docker_build
38+
uses: docker/build-push-action@v2
39+
with:
40+
file: ./Dockerfile.gpu
41+
platforms: linux/amd64
42+
push: true
43+
tags: |
44+
opendronemap/nodeodm:gpu

‎.github/workflows/publish-docker.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Publish Docker
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*
9+
10+
# Triggered by ODM build (after docker push)
11+
workflow_dispatch:
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v2
19+
- name: Set up QEMU
20+
uses: docker/setup-qemu-action@v1
21+
with:
22+
image: tonistiigi/binfmt:qemu-v7.0.0-28
23+
- name: Set up Docker Buildx
24+
uses: docker/setup-buildx-action@v1
25+
- name: Login to DockerHub
26+
uses: docker/login-action@v1
27+
with:
28+
username: ${{ secrets.DOCKERHUB_USERNAME }}
29+
password: ${{ secrets.DOCKERHUB_TOKEN }}
30+
# Use the repository information of the checked-out code to format docker tags
31+
- name: Docker meta
32+
id: docker_meta
33+
uses: crazy-max/ghaction-docker-meta@v1
34+
with:
35+
images: opendronemap/nodeodm
36+
tag-semver: |
37+
{{version}}
38+
- name: Build and push Docker image
39+
id: docker_build
40+
uses: docker/build-push-action@v2
41+
with:
42+
file: ./Dockerfile
43+
platforms: linux/amd64,linux/arm64
44+
push: true
45+
tags: |
46+
${{ steps.docker_meta.outputs.tags }}
47+
opendronemap/nodeodm:latest

‎.github/workflows/publish-windows.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Publish Windows Bundle
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- v*
9+
10+
jobs:
11+
build:
12+
runs-on: windows-latest
13+
steps:
14+
- name: Checkout
15+
uses: actions/checkout@v2
16+
- name: Setup NodeJS
17+
uses: actions/setup-node@v2
18+
with:
19+
node-version: '14'
20+
- name: Setup Env
21+
run: |
22+
npm i
23+
npm i -g nexe@4.0.0-rc.7
24+
- name: Build bundle
25+
run: |
26+
npm run winbundle
27+
- name: Upload Bundle File
28+
uses: actions/upload-artifact@v4
29+
with:
30+
name: Bundle
31+
path: dist\*.zip
32+
- name: Upload Bundle to Release
33+
uses: svenstaro/upload-release-action@v2
34+
if: startsWith(github.ref, 'refs/tags/')
35+
with:
36+
repo_token: ${{ secrets.GITHUB_TOKEN }}
37+
file: dist/*.zip
38+
file_glob: true
39+
tag: ${{ github.ref }}
40+
overwrite: true
41+

‎.github/workflows/test-build-prs.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Build PRs
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
docker:
8+
runs-on: ubuntu-latest
9+
services:
10+
registry:
11+
image: registry:2
12+
ports:
13+
- 5000:5000
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v2
17+
- name: Set up QEMU
18+
uses: docker/setup-qemu-action@v1
19+
- name: Set up Docker Buildx
20+
uses: docker/setup-buildx-action@v1
21+
with:
22+
driver-opts: network=host
23+
- name: Build
24+
uses: docker/build-push-action@v2
25+
with:
26+
context: .
27+
platforms: linux/amd64
28+
push: true
29+
tags: localhost:5000/opendronemap/nodeodm:test
30+
- name: Test Powercycle
31+
run: |
32+
docker run --rm localhost:5000/opendronemap/nodeodm:test --powercycle

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,6 @@ devConfig.json
5050
# potreeconverter 2.0 bug prevents it from running when in $PATH
5151
PotreeConverter
5252

53+
apps/
54+
nodeodm.exe
55+
dist/

‎.travis.yml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Dockerfile‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1-
FROM opendronemap/odm:2.6.4
2-
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
3-
4-
EXPOSE 3000
5-
6-
USER root
7-
8-
RUN printf "deb http://old-releases.ubuntu.com/ubuntu/ hirsute main restricted\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates main restricted\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute universe\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates universe\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute multiverse\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates multiverse\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-backports main restricted universe multiverse" > /etc/apt/sources.list
9-
10-
RUN apt-get update && apt-get install -y curl gpg-agent
11-
RUN curl --silent --location https://deb.nodesource.com/setup_14.x | bash -
12-
RUN apt-get install -y nodejs unzip p7zip-full && npm install -g nodemon && \
13-
ln -s /code/SuperBuild/install/bin/untwine /usr/bin/untwine && \
14-
ln -s /code/SuperBuild/install/bin/entwine /usr/bin/entwine && \
15-
ln -s /code/SuperBuild/install/bin/pdal /usr/bin/pdal
16-
17-
18-
RUN mkdir /var/www
19-
20-
WORKDIR "/var/www"
21-
COPY . /var/www
22-
23-
RUN npm install --production && mkdir tmp
24-
25-
ENTRYPOINT ["/usr/bin/node", "/var/www/index.js"]
1+
FROM opendronemap/odm:latest
2+
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
3+
4+
EXPOSE 3000
5+
6+
USER root
7+
8+
RUN mkdir /var/www
9+
10+
WORKDIR "/var/www"
11+
COPY . /var/www
12+
13+
ENV NVM_DIR /usr/local/nvm
14+
ENV NODE_VERSION 14
15+
16+
RUN bash install_deps.sh && \
17+
ln -s /code/SuperBuild/install/bin/untwine /usr/bin/untwine && \
18+
ln -s /code/SuperBuild/install/bin/entwine /usr/bin/entwine && \
19+
ln -s /code/SuperBuild/install/bin/pdal /usr/bin/pdal && \
20+
ln -s /var/www/node.sh /usr/bin/node && \
21+
mkdir -p tmp && node index.js --powercycle
22+
23+
ENTRYPOINT ["/usr/bin/node", "/var/www/index.js"]

‎Dockerfile.gpu‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
FROM opendronemap/odm:gpu
2+
MAINTAINER Piero Toffanin <pt@masseranolabs.com>
3+
4+
EXPOSE 3000
5+
6+
USER root
7+
8+
ENV NVM_DIR /usr/local/nvm
9+
ENV NODE_VERSION 14
10+
11+
RUN bash install_deps.sh && \
12+
ln -s /code/SuperBuild/install/bin/untwine /usr/bin/untwine && \
13+
ln -s /code/SuperBuild/install/bin/entwine /usr/bin/entwine && \
14+
ln -s /code/SuperBuild/install/bin/pdal /usr/bin/pdal && \
15+
ln -s /var/www/node.sh /usr/bin/node
16+
17+
RUN echo /usr/local/cuda-11.2/compat >> /etc/ld.so.conf.d/989_cuda-11.conf && ldconfig
18+
19+
RUN mkdir /var/www
20+
21+
WORKDIR "/var/www"
22+
RUN useradd -m -d "/home/odm" -s /bin/bash odm
23+
COPY --chown=odm:odm . /var/www
24+
25+
RUN npm install --production && mkdir -p tmp && node index.js --powercycle
26+
27+
RUN chown -R odm:odm /var/www
28+
RUN chown -R odm:odm /code
29+
30+
USER odm
31+
32+
ENTRYPOINT ["/usr/bin/node", "/var/www/index.js"]

0 commit comments

Comments
 (0)