Commit 5fb022f6 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Move ssh key around and use host network

parent 60ddd9f5

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ build-deploy: 
    - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY

    - docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_USER="$SSH_USER" -t $IMAGE .

    - docker run --user "$SSH_USER" -t $IMAGE /home/${SSH_USER}/rpmbuild.sh

    - docker run --user "$SSH_USER" -t $IMAGE scp -o StrictHostKeyChecking=no rpmbuild/RPM/noarch/${PROJECT}*.noarch.rpm ${SSH_USER}@packages.sns.gov:${PKG_PATH}

    - docker run --user "$SSH_USER" --network host -t $IMAGE scp -o StrictHostKeyChecking=no -i ${SSH_KEY} rpmbuild/RPM/noarch/${PROJECT}*.noarch.rpm ${SSH_USER}@packages.sns.gov:${PKG_PATH}

  tags:

    - sns-hfir-scse

  rules:

Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ WORKDIR $HOME 
RUN yum install -y git rpm-build && yum clean all && rm -rf /var/cache/yum



# setup ssh key

RUN mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh

RUN echo "${SSH_KEY}" > ${HOME}/.ssh/id_rsa && chmod 600 ${HOME}/.ssh/id_rsa

#RUN mkdir -p ${HOME}/.ssh && chmod 700 ${HOME}/.ssh

#RUN echo "${SSH_KEY}" > ${HOME}/.ssh/id_rsa && chmod 600 ${HOME}/.ssh/id_rsa



COPY . .