From e999d264c72335b69a4831f284fd9c96e088be5f Mon Sep 17 00:00:00 2001 From: Antoine Paletta <98616558+apaletta3@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:03:17 +0100 Subject: [PATCH 1/2] ci: debug docker build with new actions --- docker/development/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index e40b4704..3cfe75d3 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -8,6 +8,14 @@ FROM openspacecollective/open-space-toolkit-base-development:${BASE_IMAGE_VERSIO LABEL maintainer="lucas@loftorbital.com" +# Test + +RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}" \ + && export PACKAGE_PLATFORM=$(if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then echo "PC_Linux_GCC_64bit"; elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then echo "MacM1_OSX_clang_64bit"; else echo "Unknown platform" && exit 1; fi;) \ + && echo "PACKAGE_PLATFORM: ${PACKAGE_PLATFORM}" \ + && wget --quiet http://naif.jpl.nasa.gov/pub/naif/toolkit/C/${PACKAGE_PLATFORM}/packages/cspice.tar.Z \ + && ls -lh cspice.tar.Z + # Dependencies ## Zip, jq, and git-lfs From 94e72f31009d30795c4905c52ba65673edd56566 Mon Sep 17 00:00:00 2001 From: Antoine Paletta <98616558+apaletta3@users.noreply.github.com> Date: Fri, 10 Jan 2025 15:19:48 +0100 Subject: [PATCH 2/2] Update Dockerfile --- docker/development/Dockerfile | 45 ++++++++++++++++------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile index 3cfe75d3..0339f0eb 100644 --- a/docker/development/Dockerfile +++ b/docker/development/Dockerfile @@ -9,12 +9,9 @@ FROM openspacecollective/open-space-toolkit-base-development:${BASE_IMAGE_VERSIO LABEL maintainer="lucas@loftorbital.com" # Test +ARG TARGETPLATFORM -RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}" \ - && export PACKAGE_PLATFORM=$(if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then echo "PC_Linux_GCC_64bit"; elif [ "${TARGETPLATFORM}" = "linux/arm64" ]; then echo "MacM1_OSX_clang_64bit"; else echo "Unknown platform" && exit 1; fi;) \ - && echo "PACKAGE_PLATFORM: ${PACKAGE_PLATFORM}" \ - && wget --quiet http://naif.jpl.nasa.gov/pub/naif/toolkit/C/${PACKAGE_PLATFORM}/packages/cspice.tar.Z \ - && ls -lh cspice.tar.Z +RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}" # Dependencies @@ -97,25 +94,25 @@ RUN mkdir -p /tmp/sofa \ && cp -r *.a /usr/local/lib \ && rm -rf /tmp/sofa -## SPICE Toolkit - -ARG TARGETPLATFORM - -RUN cd /tmp \ - && export PACKAGE_PLATFORM=$(if [ ${TARGETPLATFORM} = "linux/amd64" ]; then echo "PC_Linux_GCC_64bit"; elif [ ${TARGETPLATFORM} = "linux/arm64" ]; then echo "MacM1_OSX_clang_64bit"; else echo "Unknown platform" && exit 1; fi;) \ - && wget --quiet http://naif.jpl.nasa.gov/pub/naif/toolkit/C/${PACKAGE_PLATFORM}/packages/cspice.tar.Z \ - && tar -xf cspice.tar.Z \ - && cd cspice \ - && apt-get update \ - && apt-get install -y csh \ - && ./makeall.csh > /dev/null \ - && mkdir -p /usr/local/include/cspice \ - && cp -r include/* /usr/local/include/cspice/ \ - && cp -r lib/* /usr/local/lib/ \ - && ln -s /usr/local/lib/cspice.a /usr/local/lib/libcspice.a \ - && rm -rf /tmp/cspice \ - && apt-get remove -y csh \ - && rm -rf /var/lib/apt/lists/* +# ## SPICE Toolkit + +# ARG TARGETPLATFORM + +# RUN cd /tmp \ +# && export PACKAGE_PLATFORM=$(if [ ${TARGETPLATFORM} = "linux/amd64" ]; then echo "PC_Linux_GCC_64bit"; elif [ ${TARGETPLATFORM} = "linux/arm64" ]; then echo "MacM1_OSX_clang_64bit"; else echo "Unknown platform" && exit 1; fi;) \ +# && wget --quiet http://naif.jpl.nasa.gov/pub/naif/toolkit/C/${PACKAGE_PLATFORM}/packages/cspice.tar.Z \ +# && tar -xf cspice.tar.Z \ +# && cd cspice \ +# && apt-get update \ +# && apt-get install -y csh \ +# && ./makeall.csh > /dev/null \ +# && mkdir -p /usr/local/include/cspice \ +# && cp -r include/* /usr/local/include/cspice/ \ +# && cp -r lib/* /usr/local/lib/ \ +# && ln -s /usr/local/lib/cspice.a /usr/local/lib/libcspice.a \ +# && rm -rf /tmp/cspice \ +# && apt-get remove -y csh \ +# && rm -rf /var/lib/apt/lists/* # GeographicLib