Commit f891db28 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch 'update-ubuntu' into 'main' 

Update ubuntu

See merge request !10
parents ee390fa0 6c54473c

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ build-packages: 
        - docker build -f dockerfiles/Dockerfile.opensuse -t opensuse --target package .

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

        - fname=`ls *.rpm | head -n 1`

        - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $fname "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/rpm/0.3.0/$fname"'

        - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $fname "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/rpm/0.4.0/$fname"'

        - fname=`ls *.deb | head -n 1`

        - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $fname "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/deb/0.3.0/$fname"'

        - 'curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file $fname "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/deb/0.4.0/$fname"'

    tags:

        - rse-multi-builder

dockerfiles/Dockerfile.opensuse

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ RUN zypper in -y google-authenticator-libpam curl python3 openssh hostname 


COPY --from=package /src/build/*.rpm  /package/



RUN zypper in -y --allow-unsigned-rpm /package/oidc-pam-0.3.0-Linux.rpm

RUN zypper in -y --allow-unsigned-rpm /package/oidc-pam-0.4.0-Linux.rpm



COPY dockerfiles/start_2fa.sh  /tmp/oidc/

COPY config/oidc-pam.json  /tmp/oidc/

dockerfiles/Dockerfile.ubuntu

+3 −3
Original line number Diff line number Diff line 
FROM ubuntu:20.04 AS package

FROM ubuntu:22.04 AS package



RUN apt-get update && apt-get install -y cmake libpam0g-dev libcurl4-openssl-dev libssl-dev vim
@@ -7,7 +7,7 @@ COPY /src /src 
WORKDIR /src

RUN bash ./build.sh DEB



FROM ubuntu:20.04 AS no2fa

FROM ubuntu:22.04 AS no2fa



RUN useradd test

RUN mkhomedir_helper test
@@ -19,7 +19,7 @@ RUN apt-get update && apt-get install -y curl python3 ssh 


COPY --from=package /src/build/*.deb  /package/



RUN dpkg -i /package/oidc-pam-0.3.0-Linux.deb

RUN dpkg -i /package/oidc-pam-0.4.0-Linux.deb



COPY config/sshd /etc/pam.d/

COPY config/sshd_pam.conf /etc/ssh/sshd_config.d/

src/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "ORNL") 
SET(CPACK_RPM_PACKAGE_MAINTAINER "ORNL")



set(CPACK_PACKAGE_VERSION_MAJOR "0")

set(CPACK_PACKAGE_VERSION_MINOR "3")

set(CPACK_PACKAGE_VERSION_MINOR "4")

set(CPACK_PACKAGE_VERSION_PATCH "0")



set(CPACK_DEBIAN_PACKAGE_DEPENDS "curl")