Commit 5a5ca328 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

build rpm for opensuse

parent dcc946fb

.gitlab-ci.yml

+14 −4
Original line number Diff line number Diff line 
stages:

    - build

    - packages



variables:

    NO2FA_URL: "${CI_REGISTRY_IMAGE}/ubuntu_sshd"
@@ -24,13 +25,22 @@ docker-build: 
    script:

        - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY

        - if [$CI_COMMIT_REF_NAME == 'master']; then export IMAGE_PREFIX=""; fi

        - docker build -f server_side/Dockerfile -t no2fa --target no2fa ./server_side

        - docker build -f server_side/Dockerfile -t with2fa --target with2fa ./server_side

        - docker run --rm -v `pwd`:/tmp no2fa bash -c "cp /package/* /tmp"

        - docker build -f server_side/dockerfiles/Dockerfile -t no2fa --target no2fa ./server_side

        - docker build -f server_side/dockerfiles/Dockerfile -t with2fa --target with2fa ./server_side

        - docker tag no2fa $NO2FA_URL$IMAGE_PREFIX:latest

        - docker tag with2fa $WITH2FA_URL$IMAGE_PREFIX:latest

        - docker push $NO2FA_URL$IMAGE_PREFIX:latest

        - docker push $WITH2FA_URL$IMAGE_PREFIX:latest

    tags:

        - rse-multi-builder



docker-build-packages:

    stage: packages

    script:

        - docker build -f server_side/dockerfiles/Dockerfile -t ubuntu22 --target package ./server_side

        - docker run --rm -v `pwd`:/tmp ubuntu22 bash -c "cp /src/c/build/*.deb /tmp"

        - docker build -f server_side/dockerfiles/Dockerfile.opensuse -t opensuse ./server_side

        - docker run --rm -v `pwd`:/tmp opensuse bash -c "cp /src/c/build/*.rpm /tmp"

    artifacts:

        paths:

            - "oidc-pam-0.1.0-Linux.deb"

server_side/build.sh

+2 −2
Original line number Diff line number Diff line 
docker build --target no2fa -t ubuntu_sshd .

docker build --target with2fa -t ubuntu_sshd_2fa .
 
 No newline at end of file
 
docker build --target no2fa -t ubuntu_sshd -f dockerfiles/Dockerfile .

docker build --target with2fa -t ubuntu_sshd_2fa -f dockerfiles/Dockerfile  .
 
 No newline at end of file

server_side/c/CMakeLists.txt

+4 −1
Original line number Diff line number Diff line
@@ -18,13 +18,16 @@ target_link_libraries(oidc-pam ${PAM_LIBRARIES} ${CURL_LIBRARIES}) 


install(TARGETS oidc-pam DESTINATION /usr/lib/security)



SET(CPACK_GENERATOR "DEB")

SET(CPACK_GENERATOR "DEB;RPM")

SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ORNL")

SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL")



set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "1")

set(CPACK_PACKAGE_VERSION_PATCH "0")



set(CPACK_DEBIAN_PACKAGE_DEPENDS "curl")

set(CPACK_RPM_PACKAGE_DEPENDS "curl")



INCLUDE(CPack)

server_side/c/build.sh

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ mkdir build 
cd build

cmake ..

make

make package
 
cpack -G $1
 
 No newline at end of file

server_side/Dockerfile→server_side/dockerfiles/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ RUN apt-get update && apt-get install -y cmake libpam0g-dev libcurl4-openssl-dev 
COPY c  /src/c



WORKDIR /src/c

RUN bash ./build.sh

RUN bash ./build.sh DEB