Commit 94f10735 authored by Yakubov, Sergey's avatar Yakubov, Sergey
Browse files

Merge branch '2-rewrite-pam-module-in-c' into 'master' 

Resolve "Rewrite pam module in C"

Closes #2

See merge request !2
parents 5046d211 2fb05518

.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line 
.idea

build

cmake-build-debug

.gitlab-ci.yml

+45 −2
Original line number Diff line number Diff line 
stages:

    - build



include:

    - local: /server_side/.gitlab-ci.yml
 
variables:

    NO2FA_URL: "${CI_REGISTRY_IMAGE}/ubuntu_sshd"

    WITH2FA_URL:   "${CI_REGISTRY_IMAGE}/opensuse_sshd_2fa"



# This import is for the func_rse_docker_* functions

before_script:

    - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O

    - source rse-bash-modules.sh

    - func_rse_docker_cleanup



after_script:

    - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O

    - source rse-bash-modules.sh

    - func_rse_docker_cleanup

    - sudo chown -R gitlab-runner .



build-docker:

    variables:

        IMAGE_PREFIX: "/$CI_COMMIT_REF_NAME"

    stage: 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/dockerfiles/Dockerfile.ubuntu -t no2fa --target no2fa ./server_side

        - docker build -f server_side/dockerfiles/Dockerfile.opensuse -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



build-packages:

    stage: build

    script:

        - docker build -f server_side/dockerfiles/Dockerfile.ubuntu -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 --target package ./server_side

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

    artifacts:

        paths:

            - "*.deb"

            - "*.rpm"

    tags:

        - rse-multi-builder
 
 No newline at end of file

server_side/.dockerignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
build
 
 No newline at end of file

server_side/.gitlab-ci.yml

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
variables:

    NO2FA_URL: "${CI_REGISTRY_IMAGE}/ubuntu_sshd"

    WITH2FA_URL:   "${CI_REGISTRY_IMAGE}/ubuntu_sshd_2fa"



# This import is for the func_rse_docker_* functions

before_script:

    - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O

    - source rse-bash-modules.sh

    - func_rse_docker_cleanup



after_script:

    - curl https://code.ornl.gov/rse-deployment/rse-sharables/raw/master/rse-bash-modules.sh -O

    - source rse-bash-modules.sh

    - func_rse_docker_cleanup

    - sudo chown -R gitlab-runner .



docker-build:

    variables:

        IMAGE_PREFIX: "/$CI_COMMIT_REF_NAME"

    rules:

        - if: $CI_COMMIT_REF_NAME == 'master'

          variables:

            IMAGE_PREFIX: ""

    stage: build

    script:

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

        - 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 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

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