Skip to content
Snippets Groups Projects
Commit 391caf4b authored by Sergey Yakubov's avatar Sergey Yakubov
Browse files

update deploys

parent dbfb61f9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 180 additions and 19 deletions
CMakeLists.txt
+ 1
− 3
View file @ 391caf4b
......@@ -135,9 +135,7 @@ endif()
set(CPACK_PACKAGE_VERSION ${ASAPO_VERSION})
set(CPACK_GENERATOR "RPM")
set(CPACK_PACKAGE_NAME "asapo")
set(CPACK_PACKAGE_RELEASE 1.${PACKAGE_RELEASE_SUFFIX})
set(CPACK_PACKAGE_RELEASE ${PACKAGE_RELEASE_SUFFIX})
set(CPACK_PACKAGE_CONTACT "IT")
set(CPACK_PACKAGE_VENDOR "DESY")
set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
......
CMakeModules/prepare_version_tag.cmake
+ 3
− 2
View file @ 391caf4b
......@@ -28,8 +28,9 @@ else()
SET (ASAPO_VERSION ${BRANCH})
SET (ASAPO_VERSION_COMMIT ", build ${ASAPO_VERSION_COMMIT}")
SET (ASAPO_VERSION_DOCKER_SUFFIX "-dev")
SET (PYTHON_ASAPO_VERSION 1.0.${ASAPO_VERSION})
string(REPLACE "_" "-" ASAPO_VERSION ${ASAPO_VERSION})
SET (ASAPO_VERSION 1.0.${ASAPO_VERSION})
SET (PYTHON_ASAPO_VERSION ${ASAPO_VERSION})
endif()
message("Asapo Version: " ${ASAPO_VERSION})
......
consumer/api/python/dist_linux/CMakeLists.txt
+ 27
− 3
View file @ 391caf4b
......@@ -10,14 +10,38 @@ endif()
if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
ADD_CUSTOM_TARGET(python-rpm-consumer ALL
COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX} --requires=numpy
COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=numpy --binary-only
COMMAND rm dist/python*.gz dist/*debuginfo*
)
ADD_CUSTOM_TARGET(python3-rpm-consumer ALL
COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX} --requires=python3-numpy
COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=python3-numpy --binary-only
COMMAND rm dist/python3*.gz dist/*debuginfo*
)
ADD_DEPENDENCIES(python-rpm-consumer copy_python_dist-consumer)
ADD_DEPENDENCIES(python3-rpm-consumer copy_python_dist-consumer)
ADD_DEPENDENCIES(python-rpm-consumer copy_python_dist-consumer)
endif()
if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
ADD_CUSTOM_TARGET(python-deb-consumer ALL
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
COMMAND rm deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
ADD_CUSTOM_TARGET(python3-deb-consumer ALL
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends3=python3-numpy bdist_deb
COMMAND rm deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
ADD_DEPENDENCIES(python3-deb-consumer copy_python_dist-consumer)
ADD_DEPENDENCIES(python-deb-consumer copy_python_dist-consumer)
endif()
ADD_CUSTOM_TARGET(copy_python_dist-consumer ALL
......
deploy/build_env/Ubuntu16.04/build_image.sh deleted 100755 → 0
+ 0
− 4
View file @ dbfb61f9
#!/usr/bin/env bash
set -e
docker build -t yakser/asapo-env:ubuntu16.04 .
docker push yakser/asapo-env:ubuntu16.04
deploy/build_env/centos/build.sh
+ 3
− 1
View file @ 391caf4b
......@@ -6,9 +6,11 @@ cmake \
-DENABLE_LIBFABRIC=ON \
-DINSTALL_EXAMPLES=ON \
-DBUILD_CLIENTS_ONLY=ON \
-DPACKAGE_RELEASE_SUFFIX=$OS \
-DPACKAGE_RELEASE_SUFFIX=1.$OS \
-DBUILD_PYTHON=OFF \
-DLIBCURL_DIR=/curl \
-DCPACK_PACKAGE_NAME="asapo-devel" \
-DCPACK_GENERATOR="RPM" \
..
make
make package
......
deploy/build_env/centos/build_el7.sh
+ 1
− 0
View file @ 391caf4b
#!/usr/bin/env bash
docker build -t yakser/asapo-env:centos7.9.2009 -f Dockerfile.7.9.2009 .
docker push yakser/asapo-env:centos7.9.2009
\ No newline at end of file
deploy/build_env/centos/build_el8.sh
+ 1
− 0
View file @ 391caf4b
#!/usr/bin/env bash
docker build -t yakser/asapo-env:centos8.3.2011 -f Dockerfile.8.3.2011 .
docker push yakser/asapo-env:centos8.3.2011
deploy/build_env/debians/Dockerfile_debian10.7 0 → 100644
+ 20
− 0
View file @ 391caf4b
from debian:10.7
ENV GOPATH /tmp
ADD install_curl.sh install_curl.sh
ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
deploy/build_env/debians/Dockerfile_debian9.13 0 → 100644
+ 20
− 0
View file @ 391caf4b
from debian:9.13
ENV GOPATH /tmp
ADD install_curl.sh install_curl.sh
ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
deploy/build_env/Ubuntu16.04/Dockerfile → deploy/build_env/debians/Dockerfile_ubuntu16.04
+ 20
− 0
View file @ 391caf4b
......@@ -5,15 +5,16 @@ ENV GOPATH /tmp
ADD install_curl.sh install_curl.sh
ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ golang zlib1g-dev python cython python-numpy python3 cython3 python3-numpy \
git wget python-pip python3-pip && \
pip --no-cache-dir install --upgrade cython && pip3 --no-cache-dir install --upgrade cython && pip3 --no-cache-dir install sphinx && \
./install_curl.sh /curl && ./install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
RUN apt-get purge -y --auto-remove
RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD build.sh /bin/build.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
deploy/build_env/debians/Dockerfile_ubuntu18.04 0 → 100644
+ 20
− 0
View file @ 391caf4b
from ubuntu:18.04
ENV GOPATH /tmp
ADD install_curl.sh install_curl.sh
ADD install_cmake.sh install_cmake.sh
RUN apt update && apt install -y g++ git wget python python3 python-numpy python3-numpy python-pip python3-pip \
zlib1g-dev python3-all-dev python-all-dev python-stdeb python3-stdeb
RUN pip --no-cache-dir install cython && pip3 --no-cache-dir install cython
RUN ./install_curl.sh /curl && ./install_cmake.sh
ADD install_libfabric.sh install_libfabric.sh
RUN ./install_libfabric.sh
ARG OS
ENV OS=${OS}
ADD build.sh /bin/build.sh
\ No newline at end of file
deploy/build_env/Ubuntu16.04/build.sh → deploy/build_env/debians/build.sh
+ 22
− 0
View file @ 391caf4b
......@@ -5,14 +5,18 @@ set -e
cd /asapo/build
cmake \
-DCMAKE_BUILD_TYPE="Release" \
-DENABLE_LIBFABRIC=on \
-DLIBCURL_DIR=/curl \
-DBUILD_PYTHON_DOCS=ON \
-DBUILD_PYTHON_PACKAGES=source \
-DENABLE_LIBFABRIC=ON \
-DINSTALL_EXAMPLES=ON \
-DBUILD_CLIENTS_ONLY=ON \
-DPACKAGE_RELEASE_SUFFIX=$OS \
-DBUILD_PYTHON=OFF \
-DLIBCURL_DIR=/curl \
-DCPACK_PACKAGE_NAME="asapo-dev" \
-DCPACK_GENERATOR="DEB" \
..
cmake .. #second time for to correctly build deb packages
make
#cd consumer/api/python/dist_linux && make python-dist-consumer
#cd ../producer/api/python/dist_linux && make python-dist-producer
#cd ../docs/sphinx && make
make package
cmake -DNUMPY_VERSION=0 -DBUILD_PYTHON=ON -DBUILD_PYTHON_PACKAGES="source;deb" ..
make
deploy/build_env/debians/build_images.sh 0 → 100755
+ 13
− 0
View file @ 391caf4b
#!/usr/bin/env bash
set -e
vers="ubuntu16.04 ubuntu18.04 debian9.13 debian10.7"
for ver in $vers
do
docker build -t yakser/asapo-env:${ver} -f Dockerfile_${ver} --build-arg OS=${ver} .
docker push yakser/asapo-env:${ver}
done
deploy/build_env/Ubuntu16.04/install_cmake.sh → deploy/build_env/debians/install_cmake.sh
+ 2
− 2
View file @ 391caf4b
......@@ -2,8 +2,8 @@
wget https://cmake.org/files/v3.10/cmake-3.10.0.tar.gz
tar zxvf cmake-3.*
cd cmake-3.*
tar zxvf cmake-3.10.0.tar.gz
cd cmake-3.10.0
./bootstrap --prefix=/usr/local
make -j$(nproc)
make install
......
deploy/build_env/manylinux2010/build_image.sh
+ 1
− 2
View file @ 391caf4b
......@@ -4,8 +4,7 @@
#./docker-squash yakser/asapo-env:manylinux2010_ -t yakser/asapo-env:manylinux2010
docker build -t yakser/asapo-env:manylinux2010 .
#docker push yakser/asapo-env:manylinux2010
#docker push yakser/asapo-env:manylinux2010
docker push yakser/asapo-env:manylinux2010
producer/api/python/dist_linux/CMakeLists.txt
+ 26
− 2
View file @ 391caf4b
......@@ -5,16 +5,40 @@ file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/setup.py INPUT ${CMAKE_CURRENT_
if ("rpm" IN_LIST BUILD_PYTHON_PACKAGES)
ADD_CUSTOM_TARGET(python-rpm-producer ALL
COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX} --requires=numpy
COMMAND PACKAGE_PREFIX=python- python setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=numpy --binary-only
COMMAND rm dist/python*.gz dist/*debuginfo*
)
ADD_CUSTOM_TARGET(python3-rpm-producer ALL
COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX} --requires=python3-numpy
COMMAND PACKAGE_PREFIX=python3- python3 setup.py bdist_rpm --release=1.${PACKAGE_RELEASE_SUFFIX}
--requires=python3-numpy --binary-only
COMMAND rm dist/python3*.gz dist/*debuginfo*
)
ADD_DEPENDENCIES(python3-rpm-producer copy_python_dist-producer)
ADD_DEPENDENCIES(python-rpm-producer copy_python_dist-producer)
endif()
if ("deb" IN_LIST BUILD_PYTHON_PACKAGES)
ADD_CUSTOM_TARGET(python-deb-producer ALL
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends=python-numpy bdist_deb
COMMAND rm deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
ADD_CUSTOM_TARGET(python3-deb-producer ALL
COMMAND rm -rf deb_dist/*/
COMMAND PACKAGE_PREFIX= python3 setup.py --command-packages=stdeb.command
sdist_dsc --debian-version=${PACKAGE_RELEASE_SUFFIX} --depends3=python3-numpy bdist_deb
COMMAND rm deb_dist/*dbgsym*
COMMAND cp deb_dist/*.deb dist/
)
ADD_DEPENDENCIES(python3-deb-producer copy_python_dist-producer)
ADD_DEPENDENCIES(python-deb-producer copy_python_dist-producer)
endif()
if ("source" IN_LIST BUILD_PYTHON_PACKAGES )
ADD_CUSTOM_TARGET(python-dist-producer ALL
COMMAND ${Python_EXECUTABLE} setup.py sdist
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

imprint | privacy | Conditions of Use