From c45a860825da32872ed4a1e8d5c0b50f99c05440 Mon Sep 17 00:00:00 2001 From: Jason Marechal Date: Tue, 7 Jan 2025 16:05:20 +0100 Subject: [PATCH] Fix permissions of asset output --- docker/centos-local-build/build.sh | 12 +++++++----- docker/centos-local-build/dockerfile | 5 +++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docker/centos-local-build/build.sh b/docker/centos-local-build/build.sh index 9843fc211..ca1989c46 100644 --- a/docker/centos-local-build/build.sh +++ b/docker/centos-local-build/build.sh @@ -1,4 +1,5 @@ #!/bin/bash +set -x #Define source directory xpansion_sources=$1 ln -s $xpansion_sources /workspace/antares-xpansion @@ -16,6 +17,10 @@ export CCACHE_BASEDIR=$ccache_cache_dir/ccache export CCACHE_COMPRESS=1 export PATH="/usr/lib/ccache:$PATH" +pip3 install --upgrade pip +pip3 install wheel +pip3 install -r /workspace/antares-xpansion/requirements-tests.txt + export VCPKG_ROOT=/workspace/antares-xpansion/vcpkg ORTOOLS_TAG=$(cat /workspace/antares-xpansion/antares-version.json | jq -r '."or-tools-rte"' ) echo "OR-Tools tag :" $ORTOOLS_TAG @@ -37,10 +42,6 @@ wget $URL_ANTARES tar -xvf antares-${ANTARES_VERSION}-CentOS-7.9.2009.tar.gz -C deps --strip-components=1 &&\ rm -rf antares-${ANTARES_VERSION}-CentOS-7.9.2009.tar.gz -pip3 install --upgrade pip -pip3 install wheel -pip3 install -r /workspace/antares-xpansion/requirements-tests.txt - source /opt/rh/devtoolset-11/enable source /opt/rh/rh-git227/enable export VCPKG_BINARY_SOURCES="clear;files,$vcpkg_cache_dir,readwrite" @@ -70,4 +71,5 @@ rm -rf build rm -rf dist rm -f *.spec cd .. -tar -czf antares-xpansion-centos.tar.gz -C $install_dir . --exclude='examples' \ No newline at end of file +tar -czf antares-xpansion-centos.tar.gz -C $install_dir . --exclude='examples' +chmod 777 antares-xpansion-centos.tar.gz \ No newline at end of file diff --git a/docker/centos-local-build/dockerfile b/docker/centos-local-build/dockerfile index 6895f3042..b4e3fef3e 100644 --- a/docker/centos-local-build/dockerfile +++ b/docker/centos-local-build/dockerfile @@ -2,11 +2,12 @@ FROM antaresrte/xpansion-centos7:1.1.1 CMD ["/bin/bash"] -RUN mkdir /workspace +RUN mkdir /workspace \ + && chmod a+w /workspace + WORKDIR /workspace ADD build.sh /workspace RUN chmod +x /workspace/build.sh - #Every container will run this ENTRYPOINT ["/workspace/build.sh"] \ No newline at end of file