Skip to content

Commit

Permalink
factorize /opt/workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
Nicolas Gargaud committed Mar 14, 2022
1 parent 5294aa8 commit d2d49ed
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ ENV USER_NAME builder
ENV PATH=$PATH:/root/.local/bin
ENV DEBIAN_FRONTEND noninteractive
ENV PIP_DEFAULT_TIMEOUT 1000
ENV WORKSPACE_PATH=/opt/workspace
ENV CPPFLAGS "-Wall -std=c++11 -fPIC"
ENV CXXFLAGS "-Wall -std=c++11 -fPIC"

Expand All @@ -32,6 +33,5 @@ COPY scripts /opt/scripts
RUN chown -R $USER_NAME:$USER_NAME /opt/scripts

USER $USER_NAME
WORKDIR /opt/workspace

WORKDIR ${WORKSPACE_PATH}
ENTRYPOINT ["/usr/bin/entrypoint.sh"]
1 change: 1 addition & 0 deletions entrypoint.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ else
if [ ! -z "$BUILDALL" ]; then
cd /opt/scripts
bash build_all.sh
ls -alh ${WORKSPACE_PATH}
else
bash
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/boost/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if [ -x "$(command -v qibuild)" ]; then
export CMAKE_INSTALL_DIR="${INSTALL_DIR}/${CMAKE_RELATIVE_DIR}"
mkdir -p "${CMAKE_INSTALL_DIR}"
cp -rv "${CMAKE_LOCAL_DIR}/"* "${CMAKE_INSTALL_DIR}"
sudo qitoolchain make-package --auto --name ${NAME} --version "1.${LIB_VER}.0" --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version "1.${LIB_VER}.0" --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/eigen3/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/icu/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/json-nlohmann/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/libusb/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/openssl/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/qt5/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/sqlite3/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/tinyxml/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/zlib/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION

if [ -x "$(command -v qibuild)" ]; then
echo "------------ Building qitoolchain package ----------------"
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output /opt/workspace/
sudo qitoolchain make-package --auto --name ${NAME} --version ${LIB_VER} --target linux64 ${INSTALL_DIR} --output ${WORKSPACE_PATH}
else
echo "Qibuild is not installed, skipping packaging"
fi
Expand Down

0 comments on commit d2d49ed

Please sign in to comment.