Build on RHEL (#13)

Related to openshiftio/openshift.io#3321

Dockerfile.deploy.rhel

@@ -0,0 +1,21 @@
+FROM prod.registry.devshift.net/osio-prod/base/pcp:latest
+LABEL maintainer "Devtools <[email protected]>"
+LABEL author "Devtools <[email protected]>"
+ENV LANG=en_US.utf8
+ENV INSTALL_PREFIX=/usr/local/fabric8-osoproxy
+
+# Create a non-root user and a group with the same name: "fabric8"
+ENV F8_USER_NAME=fabric8
+RUN useradd --no-create-home -s /bin/bash ${F8_USER_NAME}
+
+COPY dist/traefik ${INSTALL_PREFIX}/bin/fabric8-osoproxy
+COPY ./osoproxy+pmcd.sh /osoproxy+pmcd.sh
+EXPOSE 44321
+
+# From here onwards, any RUN, CMD, or ENTRYPOINT will be run under the following user
+USER ${F8_USER_NAME}
+
+WORKDIR ${INSTALL_PREFIX}
+ENTRYPOINT [ "/osoproxy+pmcd.sh" ]
+
+EXPOSE 8080

cico_build_deploy.sh

@@ -4,10 +4,16 @@
 
 ./cico_run_tests.sh
 
-docker build -t f8osoproxy-deploy -f Dockerfile.deploy .
-
 login
-tag_push ${REGISTRY}/fabric8-services/fabric8-oso-proxy:$TAG
-tag_push ${REGISTRY}/fabric8-services/fabric8-oso-proxy:latest
 
-echo 'CICO: Image pushed, ready to update deployed app'
+docker build -t f8osoproxy-deploy -f "${DOCKERFILE_DEPLOY}" .
+
+if [ "$TARGET" = "rhel" ]; then
+    tag_push ${REGISTRY}/osio-prod/fabric8-services/fabric8-oso-proxy:$TAG
+    tag_push ${REGISTRY}/osio-prod/fabric8-services/fabric8-oso-proxy:latest
+else
+    tag_push ${REGISTRY}/fabric8-services/fabric8-oso-proxy:$TAG
+    tag_push ${REGISTRY}/fabric8-services/fabric8-oso-proxy:latest
+fi
+
+echo 'CICO: Image pushed, ready to update deployed app'

cico_setup.sh

@@ -2,10 +2,17 @@
 
 REGISTRY="push.registry.devshift.net"
 
+if [ "$TARGET" = "rhel" ]; then
+  DOCKERFILE_DEPLOY="Dockerfile.deploy.rhel"
+else
+  DOCKERFILE_DEPLOY="Dockerfile.deploy"
+fi
+
 function tag_push() {
-  TARGET=$1
-  docker tag f8osoproxy-deploy $TARGET
-  docker push $TARGET
+  local tag=$1
+
+  docker tag f8osoproxy-deploy $tag
+  docker push $tag
 }
 
 # Source environment variables of the jenkins slave
@@ -35,7 +42,7 @@ set -x
 set -e
 
  # We need to disable selinux for now, XXX
-/usr/sbin/setenforce 0
+/usr/sbin/setenforce 0 || :
 
 # Get all the deps in
 yum -y install \

openshift/OpenShiftTemplate.yml

@@ -49,7 +49,7 @@ objects:
               configMapKeyRef:
                 name: f8osoproxy
                 key: auth.url
-          image: registry.devshift.net/fabric8-services/fabric8-oso-proxy:${IMAGE_TAG}
+          image: ${IMAGE}:${IMAGE_TAG}
           name: f8osoproxy
           imagePullPolicy: Always
           ports:
@@ -100,5 +100,7 @@ objects:
     selector:
       deploymentconfig: f8osoproxy
 parameters:
+- name: IMAGE
+  value: registry.devshift.net/fabric8-services/fabric8-oso-proxy
 - name: IMAGE_TAG
   value: latest