Commit 6f6ab6f8 authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Move work back into Dockerfile

parent 5fb022f6

.gitlab-ci.yml

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ build-deploy: 
  script:

    - 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" --network host -t $IMAGE scp -o StrictHostKeyChecking=no -i ${SSH_KEY} rpmbuild/RPM/noarch/${PROJECT}*.noarch.rpm ${SSH_USER}@packages.sns.gov:${PKG_PATH}

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

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

+6 −5
Original line number Diff line number Diff line
@@ -9,17 +9,18 @@ RUN useradd $SSH_USER 


ENV HOME /home/$SSH_USER

WORKDIR $HOME

#USER $SSH_USER



# install dependencies

RUN yum install -y git rpm-build && yum clean all && rm -rf /var/cache/yum



USER $SSH_USER



# 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 .ssh && chmod 700 .ssh

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



COPY . .



#RUN $HOME/rpmbuild.sh

RUN $HOME/rpmbuild.sh



#RUN scp -i ${SSH_KEY} rpmbuild/RPM/noarch/${PROJECT}*.noarch.rpm $SSH_USER@packages.sns.gov:${PKG_PATH}
 
RUN scp -o StrictHostKeyChecking=no rpmbuild/RPM/noarch/${PROJECT}*.noarch.rpm $SSH_USER@packages.sns.gov:${PKG_PATH}