Trying to cleanup dockerfile and workflows

TzeLun · Jan 5, 2022 · b0858da · b0858da
1 parent c2f974c
commit b0858da
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 60 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -12,4 +12,4 @@ jobs:
 
       - name: Build docker image
         run: |
-          docker build --tag=ambf-ros-noetic .
+          docker build --tag=ambf-ros-noetic docker/noetic/Dockerfile -f .
diff --git a/Dockerfile b/Dockerfile
diff --git a/docker/noetic/Dockerfile b/docker/noetic/Dockerfile
@@ -42,14 +42,14 @@ RUN apt-get update && \
   rm -rf /var/lib/apt/lists/*
 
 # Build AMBF
-RUN . /opt/ros/${ROS_VERSION}/setup.sh && \
+RUN . /opt/ros/noetic/setup.sh && \
   mkdir -p ${AMBF_WS}/build && \
   cd ${AMBF_WS}/build && \
   cmake ../ && \
   make -j$(nproc)
 
 RUN touch ${HOME}/.bashrc && \
-  echo "source /opt/ros/${ROS_VERSION}/setup.bash" >> ${HOME}/.bashrc && \
+  echo "source /opt/ros/$ROS_VERSION/setup.bash" >> ${HOME}/.bashrc && \
   echo "source $AMBF_WS/build/devel/setup.bash" >> ${HOME}/.bashrc
 
 RUN . ${HOME}/.bashrc