Skip to content

Enforce HTTPS on VICAR downloads in runtime and builder Dockerfiles #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-ai-integration wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Enforce HTTPS on VICAR downloads in runtime and builder Dockerfiles #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions terrain-intelligence-generator/builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ RUN rm -f /bin/csh && ln -s /bin/tcsh /bin/csh
# The binaries tarball ships the sources too, so $V2TOP/mars/src/prog and
# $V2TOP/p2/prog are available as a reference tree to copy a unit from.
RUN echo "Downloading VICAR binaries and sources..." && \
curl -L "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${BINARIES_FILE}" -o /tmp/vicar_bin.tar.gz && \
curl --proto "=https" --tlsv1.2 -fL "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${BINARIES_FILE}" -o /tmp/vicar_bin.tar.gz && \
mkdir -p ${V2TOP} && cd /tmp && tar -xzf vicar_bin.tar.gz && \
EXTRACTED_DIR=$(ls -d vicar_open_bin_* 2>/dev/null | head -1) && \
if [ -d "$EXTRACTED_DIR/vicar_open_${VICAR_VERSION}" ]; then \
Expand All @@ -62,7 +62,7 @@ RUN echo "Downloading VICAR binaries and sources..." && \
echo "✓ VICAR $(du -sh ${V2TOP} | cut -f1) unpacked"

RUN echo "Downloading VICAR external libraries..." && \
curl -L "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${EXTERNAL_FILE}" -o /tmp/vicar_ext.tar.gz && \
curl --proto "=https" --tlsv1.2 -fL "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${EXTERNAL_FILE}" -o /tmp/vicar_ext.tar.gz && \
mkdir -p ${WORKSPACE}/external && cd /tmp && tar -xzf vicar_ext.tar.gz && \
EXTRACTED_DIR=$(ls -d vicar_open_ext_* 2>/dev/null | head -1) && \
CONTENT_COUNT=$(find "$EXTRACTED_DIR" -maxdepth 1 -mindepth 1 | wc -l) && \
Expand Down
4 changes: 2 additions & 2 deletions terrain-intelligence-generator/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ RUN dnf install -y curl tar gzip && \

# Download and extract VICAR binaries
RUN echo "Downloading VICAR binaries..." && \
curl -L "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${BINARIES_FILE}" -o vicar_bin.tar.gz && \
curl --proto "=https" --tlsv1.2 -fL "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${BINARIES_FILE}" -o vicar_bin.tar.gz && \
echo "Extracting VICAR binaries..." && \
mkdir -p /vicar/dev && \
tar -xzf vicar_bin.tar.gz && \
Expand All @@ -50,7 +50,7 @@ RUN echo "Downloading VICAR binaries..." && \

# Download and extract VICAR external libraries
RUN echo "Downloading VICAR external libraries..." && \
curl -L "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${EXTERNAL_FILE}" -o vicar_ext.tar.gz && \
curl --proto "=https" --tlsv1.2 -fL "https://github.com/NASA-AMMOS/VICAR/releases/download/${VICAR_VERSION}/${EXTERNAL_FILE}" -o vicar_ext.tar.gz && \
echo "Extracting VICAR external libraries..." && \
mkdir -p /vicar/external && \
tar -xzf vicar_ext.tar.gz && \
Expand Down
Loading