Linux: Rename curl in Dockerfiles

tmp64 · Dec 2, 2023 · df7cdf0 · df7cdf0
1 parent 64942f3
commit df7cdf0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...ainers/linux/Dockerfile.bhl-build-libcurl → containers/linux/Dockerfile.bhl-build-curl b/...ainers/linux/Dockerfile.bhl-build-libcurl → containers/linux/Dockerfile.bhl-build-curl
@@ -1,13 +1,13 @@
 FROM bhl-build
 
 ENV BUILD_DATE="2023-11-26.1"
-ENV LIBZIP_VERSION="8.4.0"
+ENV CURL_VERSION="8.4.0"
 
 # Download and extract
-WORKDIR /build/libzip
+WORKDIR /build/curl
 
 RUN curl -f -L \
-    https://curl.se/download/curl-${LIBZIP_VERSION}.tar.xz \
+    https://curl.se/download/curl-${CURL_VERSION}.tar.xz \
     -o libcurl.tar.xz
 
 RUN tar -xvf libcurl.tar.xz
@@ -17,7 +17,7 @@ COPY out/zlib/. ${BHL_PREFIX_PATH}
 COPY out/mbedtls/. ${BHL_PREFIX_PATH}
 
 # Build
-WORKDIR curl-${LIBZIP_VERSION}/_build
+WORKDIR curl-${CURL_VERSION}/_build
 RUN cmake .. \
     -GNinja \
     -DCMAKE_TOOLCHAIN_FILE=${BHL_TOOLCHAIN} \

diff --git a/containers/linux/build-libcurl.sh → containers/linux/build-curl.sh b/containers/linux/build-libcurl.sh → containers/linux/build-curl.sh
@@ -2,10 +2,10 @@
 
 set -e
 
-IMAGE_TAG="bhl-build-libcurl"
+IMAGE_TAG="bhl-build-curl"
 TEMP_CONT="${IMAGE_TAG}-temp"
 DOCKERFILE="Dockerfile.$IMAGE_TAG"
-OUT_DIR="out/libcurl"
+OUT_DIR="out/curl"
 
 mkdir -p $OUT_DIR