clean up old sti artifacts

Author: bparees

centos-ruby-builder/Dockerfile

@@ -1,6 +1,19 @@
-# centos-ruby
+# Self-contained Ruby builder image.
 #
-# This image provide a base for running Ruby based applications. It provides
+# You can use this image to produce an application image providing the source
+# code:
+#
+# $ docker run -v $(pwd):/tmp/src openshift/centos-ruby-selfcontained
+# <your application is being build>
+#
+# $ docker commit <id> your_application
+#
+# Then you can start your application using:
+#
+# $ docker run -p :9292 your_application
+#
+#
+# This image provides a base for running Ruby based applications. It provides
 # just base Ruby installation using SCL and Ruby application server.
 #
 # If you want to use Bundler with C-extensioned gems or MySQL/PostGresql, you
@@ -12,7 +25,7 @@ MAINTAINER Michal Fojtik <mfojtik@redhat.com>
 
 # Pull in important updates and then install ruby193 SCL
 #
-RUN yum update --assumeyes && \
+RUN yum update --assumeyes --skip-broken && \
       yum install --assumeyes centos-release-SCL gettext tar which && \
       yum install --assumeyes ruby193 ruby193-ruby-devel \
       gcc-c++ automake autoconf curl-devel openssl-devel \
@@ -34,8 +47,7 @@ ADD ./etc /opt/ruby/etc/
 #        maintain backward compatibility
 #
 RUN cp -f /opt/ruby/bin/prepare /usr/bin/prepare && \
-    cp -f /opt/ruby/bin/run /usr/bin/run && \
-    cp -f /opt/ruby/bin/save-artifacts /usr/bin/save-artifacts
+    cp -f /opt/ruby/bin/run /usr/bin/run
 
 RUN chown -R ruby:ruby /opt/ruby
 
@@ -52,13 +64,11 @@ ENV APP_ROOT .
 ENV HOME     /opt/ruby
 ENV PATH     $HOME/bin:$PATH
 
-# FIXME: This might be a potential bug in STI where if we keep the USER
-# instruction here, the resulting application image will fail to run.
+# The initial 'start' command will trigger an application build when it runs in
+# 'self-contained' builder context. After application is built, then this
+# command is replaced in final application image by the 'run' command.
 #
-# USER ruby
+RUN chown -R ruby:ruby /opt/ruby/bin
 
-EXPOSE 9292
-
-# Display STI usage when invoked outside STI builder
-#
-CMD ["/opt/ruby/bin/usage"]
+USER ruby
+ENTRYPOINT ["/opt/ruby/bin/start"]

centos-ruby/Dockerfile centos-ruby-selfcontained/Dockerfile

@@ -8,7 +8,6 @@ RUN git clone https://github.com/sstephenson/rbenv.git /opt/rbenv && cd /opt/rbe
 
 ADD ./prepare /usr/bin/
 ADD ./run /usr/bin/
-ADD ./save-artifacts /usr/bin/
 ADD ./ruby_context /usr/bin/
 
 EXPOSE 9292

centos-ruby/bin/prepare centos-ruby-selfcontained/bin/prepare

@@ -8,7 +8,7 @@ FROM centos
 MAINTAINER Ben Parees <bparees@redhat.com>
 
 RUN yum -y update && \
-    yum -y install tar java-1.7.0-openjdk java-1.7.0-openjdk-devel unzip which bc vim vi && \
+    yum -y install tar java-1.7.0-openjdk java-1.7.0-openjdk-devel unzip which bc vi&& \
     yum clean all
 
 # Install maven
@@ -23,27 +23,14 @@ RUN tar -xf wildfly-8.1.0.CR1.tar.gz && \
     rm wildfly-8.1.0.CR1.tar.gz && \
     mv wildfly-8.1.0.CR1 wildfly && \
     /wildfly/bin/add-user.sh admin passw0rd_  --silent
-ADD ./wfmodules/ /wildfly/modules/    
 
-# Configure Source-To-Image scripts
-ADD ./bin /usr/bin/
-RUN chmod a+rx /usr/bin/{prepare,run,save-artifacts}
+# Add mysql and postgres jbdbc driver modules
+ADD ./wfmodules/ /wildfly/modules/    
 
-# Add geard/sti wildfly customizations
+# Add wildfly customizations
 ADD ./wfbin/standalone.conf /wildfly/bin/standalone.conf
 ADD ./wfcfg/standalone.xml /wildfly/standalone/configuration/standalone.xml
-
-# Add sample jee application
-# This app will be built/run if no other source is bind-mounted to mask it.
-ADD https://github.com/bparees/openshift-jee-sample/archive/master.tar.gz master.tar.gz
-RUN mkdir /tmp/src && \
-    tar -C /tmp/src --strip-components=1 -zxf master.tar.gz && \
-    rm master.tar.gz
-    
-# Configure source location
-RUN mkdir -p /opt/wildfly/source
-WORKDIR /opt/wildfly/source
-
+   
 # Create wildfly group and user, set file ownership to that user.
 RUN groupadd -r wildfly -g 433 && \
     useradd -u 431 -r -g wildfly -d /opt/wildfly -s /sbin/nologin -c "Wildfly user" wildfly && \
@@ -53,4 +40,4 @@ RUN groupadd -r wildfly -g 433 && \
 
 USER wildfly
 EXPOSE 7600 8080 9990 9999
-CMD /usr/bin/usage
+CMD /wildfly/bin/standalone.sh -b 0.0.0.0 -bmanagement 0.0.0.0