Skip to content

Commit

Permalink
fix 1
Browse files Browse the repository at this point in the history
  • Loading branch information
joseviccruz committed Feb 24, 2024
1 parent 3b3d972 commit 03194b8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
3 changes: 3 additions & 0 deletions devcontainers/scripts/cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ echo -e "\x1B[01;93mInstalling or updating cmake...\n\u001b[0m"

TMP_DIR="/tmp/cmake"

rm -rf "${TMP_DIR}"
mkdir -p "${TMP_DIR}"

wget "https://github.com/Kitware/CMake/releases/download/v${VERSION}/cmake-${VERSION}.tar.gz" -O "${TMP_DIR}/cmake.tar.gz"
tar -xvf "${TMP_DIR}/cmake.tar.gz" -C "${TMP_DIR}"

Expand Down
18 changes: 9 additions & 9 deletions devcontainers/ssl-core-cpp-base.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM mcr.microsoft.com/vscode/devcontainers/base:latest
FROM mcr.microsoft.com/vscode/devcontainers/base:ubuntu

ARG GCC_VERSION='12'
ARG GCC_VERSION='13'
ARG LLVM_VERSION='18'
ARG CMAKE_VERSION='3.29.0-rc2'
ARG NINJA_VERSION='1.11.1'
Expand All @@ -13,19 +13,19 @@ WORKDIR /tmp/scripts

RUN apt update && apt upgrade -y && \
\
bash gcc.sh '${GCC_VERSION}' && \
bash llvm.sh '${LLVM_VERSION}' && \
bash cmake.sh '${CMAKE_VERSION}' && \
bash ninja.sh '${NINJA_VERSION}' && \
bash gcc.sh ${GCC_VERSION} && \
bash llvm.sh ${LLVM_VERSION} && \
bash cmake.sh ${CMAKE_VERSION} && \
bash ninja.sh ${NINJA_VERSION} && \
\
bash googletest.sh '/usr/local' && \
bash benchmark.sh '/usr/local' && \
\
bash protobuf.sh '/usr/local' && \
\
bash libzmq.sh '${LIBZMQ_VERSION}' '/usr/local' && \
bash cppzmq.sh '${CPPZMQ_VERSION}' '/usr/local' && \
bash libzmq.sh ${LIBZMQ_VERSION} '/usr/local' && \
bash cppzmq.sh ${CPPZMQ_VERSION} '/usr/local' && \
\
bash buf.sh '${BUF_VERSION}' '/usr/local/bin'
bash buf.sh ${BUF_VERSION} '/usr/local/bin'

RUN rm -rf /tmp/scripts
2 changes: 1 addition & 1 deletion devcontainers/ssl-core-python-base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ COPY devcontainers/scripts /tmp/scripts
WORKDIR /tmp/scripts

RUN apt update && apt upgrade -y && \
bash protoc.sh '${PROTOC_VERSION}' '/usr/local/bin'
bash protoc.sh ${PROTOC_VERSION} '/usr/local/bin'

RUN rm -rf /tmp/scripts

0 comments on commit 03194b8

Please sign in to comment.