Merge pull request #16 from danielTobon43/test-2

Fixes #15

Author: Daniel

.github/workflows/cd.yml

@@ -4,6 +4,8 @@ on:
   push:
     tags:
       - "*"
+  workflow_dispatch:
+
 env:
   IMAGE_NAME: dbscan-octrees
 
@@ -21,14 +23,11 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Download artifact
-        uses: actions/download-artifact@master
+      - name: Artifact (with permissions)
+        uses: actions/cache@v2
         with:
-          name: build
-          path: install
-
-      - name: Install PCL
-        run: sudo apt-get update && sudo apt-get install libpcl-dev
+          path: ${{github.workspace}}/install
+          key: artifacts-${{ github.run_id }}-${{ github.run_number }}
 
       - name: Docker meta
         id: meta
@@ -49,21 +48,30 @@ jobs:
         # This is where you will update the PAT to GITHUB_TOKEN
         run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
 
-      - name: Build and push
+      - name: Build docker image
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: Dockerfile.release
-          push: true
+          file: Dockerfile.release.ubuntu
+          load: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-#           cache-from: type=registry,ref=ghcr.io/danieltobon43/${{ env.IMAGE_NAME }}:latest
-#           cache-to: type=inline
+          cache-from: type=registry,ref=ghcr.io/danieltobon43/${{ env.IMAGE_NAME }}:sha-${GITHUB_SHA::7}
+          cache-to: type=inline
 
       - name: Test image
         run: |
           docker run --rm \
           --env="DISPLAY" \
           --env="QT_X11_NO_MITSHM=1" \
           --volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \
-          dbscan-octrees:latest
+          ghcr.io/danieltobon43/${{ env.IMAGE_NAME }}:sha-${GITHUB_SHA::7}
+
+      - name: Push docker image
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/ci.yml

@@ -3,8 +3,9 @@ name: CI (continuous integration)
 on:
   push:
     paths-ignore: ["**.md"]
-    branches: ["empty"]
-#     branches-ignore: ["master"]
+    branches-ignore: ["master"]
+    tags-ignore:
+      - "**"
   workflow_call:
 
 jobs:

.github/workflows/lint_and_test.yml

@@ -19,7 +19,8 @@ jobs:
       - name: Install PCL
         run: sudo apt-get update && sudo apt-get install libpcl-dev
 
-      - name: Configure CMake
+      - name: Configure CMake project
+
         run: cmake -B build -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_INSTALL_PREFIX=install
 
       - name: Build app
@@ -31,11 +32,12 @@ jobs:
       - name: Test app
         run: build/app
 
-      - name: Store artifact
-        uses: actions/upload-artifact@master
+      - name: Artifact (with permissions)
+        uses: actions/cache@v2
         with:
-          name: build
-          path: install
+          path: ${{github.workspace}}/install
+          key: artifacts-${{ github.run_id }}-${{ github.run_number }}
+
 
   lint:
     needs: [build]

.github/workflows/release-alpine.yml

@@ -29,8 +29,8 @@ jobs:
           make_install: true
 
       - name: Build Docker Image
-        run: docker build --file Dockerfile.release --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" .
-
+        run: docker build --file Dockerfile.release.alpine --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}" .
+        
       - name: Test Docker Image
         run: |
           docker run --rm \

Dockerfile.release renamed to Dockerfile.release.alpine

@@ -1,4 +1,4 @@
 FROM danieltobon43/pcl-docker:1.12.1-alpine3.15-All AS runtime
 COPY install/ /usr
 LABEL org.opencontainers.image.description DESCRIPTION
-ENTRYPOINT ["app"]
+ENTRYPOINT ["app"]

Dockerfile.release.ubuntu

@@ -0,0 +1,7 @@
+FROM ghcr.io/danieltobon43/pcl-docker:latest AS runtime
+COPY install /usr
+# RUN chmod a+x /usr/bin/app
+ENV MESA_LOADER_DRIVER_OVERRIDE i965
+
+# ======== Run binary file ========
+ENTRYPOINT ["app"]

README.md

@@ -136,12 +136,26 @@ docker run --rm -it \
            --env="XAUTHORITY=/tmp/.docker.xauth" \
            --env="DISPLAY" \
            --name="dbscan" \
-           --cap-add sys_ptrace \
-           -p 127.0.0.1:2222:22 \
            --volume=[PATH TO YOUR PCD FOLDER]:/tmp \
            -t ghcr.io/danieltobon43/dbscan-octrees:latest --cloudfile /tmp/[YOUR PCD FILENAME]
 ```
 
+If you get something like this after setting `--display` flag it might be related to [this](https://stackoverflow.com/questions/48833451/no-protocol-specified-when-running-a-sudo-su-app-on-ubuntu-linux):
+
+```bash
+No protocol specified
+```
+Try running with the following command or use the provided `.sh` [script](https://github.com/danielTobon43/DBScan-PCL-Optimized/blob/master/scripts/run_dbscan.sh):
+```
+sudo -sE docker run --rm -it \
+           --env="DISPLAY" \
+           --volume=/tmp/.X11-unix:/tmp/.X11-unix:rw \
+           --volume=/tmp/.docker.xauth:/tmp/.docker.xauth:rw \
+           --name="dbscan" \
+           --volume=[PATH TO YOUR PCD FOLDER]:/tmp \
+           -t ghcr.io/danieltobon43/dbscan-octrees:latest --cloudfile /tmp/[YOUR PCD FILENAME] --display
+```
+
 **2. Option 2: shell script**
 
 - Create a `visualizer.sh` file with executable permissions (check this shell script [dbscan-shell-script](https://github.com/danielTobon43/DBScan-PCL-Optimized/blob/master/scripts/run_dbscan.sh)).