From 03194b84ffa3ed48b3567880b7b6883a8a193d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Cruz?= <jvsc@cin.ufpe.br>
Date: Fri, 23 Feb 2024 22:06:39 -0300
Subject: [PATCH] fix 1

---
 devcontainers/scripts/cmake.sh                |  3 +++
 devcontainers/ssl-core-cpp-base.Dockerfile    | 18 +++++++++---------
 devcontainers/ssl-core-python-base.Dockerfile |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/devcontainers/scripts/cmake.sh b/devcontainers/scripts/cmake.sh
index 4fceb64..7455ac6 100644
--- a/devcontainers/scripts/cmake.sh
+++ b/devcontainers/scripts/cmake.sh
@@ -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}"
 
diff --git a/devcontainers/ssl-core-cpp-base.Dockerfile b/devcontainers/ssl-core-cpp-base.Dockerfile
index 82aed25..954ce64 100644
--- a/devcontainers/ssl-core-cpp-base.Dockerfile
+++ b/devcontainers/ssl-core-cpp-base.Dockerfile
@@ -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'
@@ -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
diff --git a/devcontainers/ssl-core-python-base.Dockerfile b/devcontainers/ssl-core-python-base.Dockerfile
index 9e85e3b..8d7a134 100644
--- a/devcontainers/ssl-core-python-base.Dockerfile
+++ b/devcontainers/ssl-core-python-base.Dockerfile
@@ -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