branch tag

CSVD · Jun 28, 2019 · 34d05cd · 34d05cd
1 parent 03ef1c7
commit 34d05cd
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,21 +16,41 @@
                 command: docker login -u $DOCKER_USER -p $DOCKER_PASS
           - run:
               name: Build Docker image
-              command: pushd package; docker build -f Dockerfile -t $IMAGE_NAME:build .
+              command: pushd package; docker build -f Dockerfile --build-arg RH_ORG=$RH_ORG --build-arg RG_ACTIVATION=$RG_ACTIVATION -t $IMAGE_NAME:build .
           - run:
               name: Tag Docker image
               command: docker tag $IMAGE_NAME:build $IMAGE_NAME:$CIRCLE_SHA1
           - run:
               name: Push Docker image
               command: docker push $IMAGE_NAME:$CIRCLE_SHA1
+      branchtag:
+        environment:
+          IMAGE_NAME: rfaircloth/scs
+        docker:
+          - image: circleci/buildpack-deps:stretch
+        steps:
+          - setup_remote_docker:
+              docker_layer_caching: true
+          - run:
+                name: Docker Login
+                command: docker login -u $DOCKER_USER -p $DOCKER_PASS
+          - run:
+              name: Tag Docker image
+              command: docker tag $IMAGE_NAME:$CIRCLE_SHA1 $IMAGE_NAME:$CIRCLE_BRANCH
+          - run:
+              name: Push Docker image
+              command: docker push $IMAGE_NAME:$CIRCLE_BRANCH
+
+
 
     workflows:
       version: 2
       build-publish:
         jobs:
           - build:
+          - branchtag:
               filters:
                 branches:
                   only:
                     - master
-                    - develop
+                    - develop
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -1,10 +1,13 @@
 FROM registry.access.redhat.com/rhel7/rhel
 
+ARG RH_ORG
+ARG RG_ACTIVATION
+
 ENV           CONFIGURE_FLAGS="--prefix=/opt/syslog-ng --with-ivykis=system --with-jsonc=system --disable-env-wrapper --disable-memtrace --enable-tcp-wrapper --disable-linux-caps --disable-man-pages --enable-all-modules --enable-force-gnu99 --enable-json --enable-native --enable-python --enable-http --enable-kafka --disable-java --disable-java-modules --disable-spoof_source --disable-sun_streams --disable-sql --disable-pacct --disable-mongodb --disable-amqp --disable-stomp --disable-redis --disable-systemd --disable-geoip --disable-geoip2 --disable-riemann --disable-smtp --disable-snmp_dest --with-python=3 --enable-dynamic-linking"
 
 ENV DISTCHECK_CONFIGURE_FLAGS="--prefix=/opt/syslog-ng --with-ivykis=system --with-jsonc=system --disable-env-wrapper --disable-memtrace --enable-tcp-wrapper --disable-linux-caps --disable-man-pages --enable-all-modules --enable-force-gnu99 --enable-json --enable-native --enable-python --enable-http --enable-kafka --disable-java --disable-java-modules --disable-spoof_source --disable-sun_streams --disable-sql --disable-pacct --disable-mongodb --disable-amqp --disable-stomp --disable-redis --disable-systemd --disable-geoip --disable-geoip2 --disable-riemann --disable-smtp --disable-snmp_dest --with-python=3 --enable-dynamic-linking"
 COPY confluent.repo /etc/yum.repos.d/confluent.repo
-RUN subscription-manager register --org=12579482 --activationkey=dev1 --force
+RUN subscription-manager register --org=$RH_ORG --activationkey=$RG_ACTIVATION --force
 RUN subscription-manager repos --enable=rhel-7-server-extras-rpms --enable=rhel-7-server-optional-rpms --enable=rhel-server-rhscl-7-rpms
 RUN subscription-manager repos --enable "rhel-*-optional-rpms" --enable "rhel-*-extras-rpms"  --enable "rhel-ha-for-rhel-*-server-rpms"
 RUN yum install wget -y