updates to use a different base image since the previous only supported amd64

Author: mrwalter

.env

@@ -1,2 +1,2 @@
-UBUNTU_VERSION_LATEST="20.04"
-UBUNTU_VERSION_PREVIOUS="18.04"
+UBUNTU_VERSION_LATEST=20.04
+UBUNTU_VERSION_PREVIOUS=18.04

Dockerfile

@@ -6,7 +6,10 @@ ARG MAINTAINER="Matthew Walter ([email protected])"
 ARG UBUNTU_VERSION=20.04
 
 # Base image
-FROM nvidia/opengl:1.0-glvnd-devel-ubuntu$UBUNTU_VERSION
+#FROM nvidia/opengl:1.0-glvnd-devel-ubuntu$UBUNTU_VERSION
+FROM ubuntu:$UBUNTU_VERSION
+
+ARG TARGETPLATFORM
 
 # Ubuntu version
 #ENV UBUNTU_DISTRIB_CODENAME "focal"
@@ -49,17 +52,31 @@ RUN echo 'net.core.rmem_default=10485760' >> /etc/sysctl.conf
 # set default LCM_VERSION
 ENV LCM_VERSION '1.5.0'
 
+# On at least arm/v7, wget throws an error stating that
+# it can not verify github.com's certificate
+# RUN if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+#         update-ca-certificates -f; \
+#     fi
+
+
+# CMake is unable to find glib-2.0 libraries 
+# using the LCM-provided cmake/FindGLib2.cmake
+#RUN if [ "$TARGETPLATFORM" = "linux/arm/v7" ]; then \
+#ENV GLIB_PATH=/usr/lib/arm-linux-gnueabihf/
+#ENV Python_LIBRARY=/usr/lib/arm-linux-gnueabihf/libpython3.8.so
+#    fi
+
 # install LCM
 RUN \
 # pull lcm
     # Zip files are prepended with 'v'
     wget https://github.com/lcm-proj/lcm/archive/refs/tags/v$LCM_VERSION.zip && \
-# open up the source
+    # open up the source
     unzip v$LCM_VERSION.zip && \
-# configure, build, install, and configure LCM
+    # configure, build, install, and configure LCM
     cd lcm-$LCM_VERSION && mkdir build && cd build && cmake ../ && make install && ldconfig && \
-# delete source code
+    # delete source code
     cd / && rm -rf v$LCM_VERSION.zip lcm-$LCM_VERSION
 
 # configure pkgconfig to find LCM
-ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$LCM_INSTALL_DIR/pkgconfig
+ENV PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$LCM_INSTALL_DIR/pkgconfig

Makefile

@@ -13,8 +13,8 @@ include .env
 #UBUNTU_VERSION_PREVIOUS = "18.04"
 
 # Base environments
-BASE_IMAGE_ENVIRONMENT_LATEST = "nvidia/opengl:1.0-glvnd-devel-ubuntu${UBUNTU_VERSION_LATEST}"
-BASE_IMAGE_ENVIRONMENT_PREVIOUS = "nvidia/opengl:1.0-glvnd-devel-ubuntu${UBUNTU_VERSION_PREVIOUS}"
+BASE_IMAGE_ENVIRONMENT_LATEST = ubuntu:${UBUNTU_VERSION_LATEST}#"nvidia/opengl:1.0-glvnd-devel-ubuntu${UBUNTU_VERSION_LATEST}
+BASE_IMAGE_ENVIRONMENT_PREVIOUS = ubuntu:${UBUNTU_VERSION_PREVIOUS}#"nvidia/opengl:1.0-glvnd-devel-ubuntu${UBUNTU_VERSION_PREVIOUS}"
 
 
 # Tag: latest
@@ -58,10 +58,10 @@ push: pre-push do-push post-push ## pushes the images to dockerhub
 
 do-push: 
 	# Push lateset
-	docker buildx build --build-arg="UBUNTU_VERSION=${UBUNTU_VERSION_LATEST}" --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --push --tag $(BUILD_IMAGE_LATEST) -f Dockerfile .
+	docker buildx build --build-arg="UBUNTU_VERSION=${UBUNTU_VERSION_LATEST}" --platform linux/arm64/v8,linux/amd64 --push --tag $(BUILD_IMAGE_LATEST) -f Dockerfile .
 
 	# Push previous
-	docker buildx build --build-arg="UBUNTU_VERSION=${UBUNTU_VERSION_PREVIOUS}" --platform linux/arm/v7,linux/arm64/v8,linux/amd64 --push --tag $(BUILD_IMAGE_PREVIOUS) -f Dockerfile .
+	docker buildx build --build-arg="UBUNTU_VERSION=${UBUNTU_VERSION_PREVIOUS}" --platform linux/arm64/v8,linux/amd64 --push --tag $(BUILD_IMAGE_PREVIOUS) -f Dockerfile .
 
 
 cleanup: ## Remove images pulled/generated as part of the build process