Commit 1db7c4da authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Move around bits of code

parent facb99e8
Loading
Loading
Loading
Loading
Loading
+1 −6
Original line number Diff line number Diff line
@@ -11,12 +11,7 @@ build-deploy:
  stage: build-deploy
  environment: $CI_COMMIT_REF_SLUG
  script:
    - docker build -t $IMAGE .
    - docker run --rm -v ${PWD}:/root/rpmbuild/RPMS/noarch $IMAGE
    - cp $SSH_KEY . && chmod 600 $SSH_KEY
    - scp -i $SSH_KEY ${PROJECT}*.noarch.rpm $SSH_USER@packages.sns.gov:${PKG_PATH}
    - docker rmi $IMAGE
    - rm -f $SSH_KEY ${PROJECT}*.noarch.rpm
    - docker build --build-arg SSH_KEY="$SSH_KEY" --build-arg SSH_USER="$SSH_USER" -t $IMAGE .
  tags:
    - sns-hfir-scse
  rules:
+17 −3
Original line number Diff line number Diff line
FROM centos:7
FROM code.ornl.gov:4567/rse/images/centos:7

ARG SSH_KEY
ARG SSH_USER
ARG PROJECT=nsd-app-wrap
ARG PKG_PATH=/var/www/html/distros/rhel/7/sns/RPMS/noarch

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

WORKDIR /root

RUN mkdir -p rpmbuild/SOURCES
COPY . .

ENTRYPOINT /root/rpmbuild.sh
RUN $HOME/rpmbuild.sh

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