Update Shipyard Dockerfiles

Author: eanylin

shipyard/Dockerfile

@@ -17,8 +17,11 @@ FROM ubuntu:16.04
 ENV DEBIAN_FRONTEND noninteractive
 ENV container docker
 
-RUN apt -qq update && \
-    apt -y install \
+# Shipyard
+ARG SHIPYARD_HOME=/home/shipyard
+
+RUN apt-get -qq update && \
+    apt-get -y install \
     git \
     curl \
     netcat \
@@ -40,7 +43,7 @@ RUN apt -qq update && \
     && pip install uwsgi \
     && pip install configparser \
     && pip install python-openstackclient==3.11.0 \
-    && apt clean \  
+    && apt-get clean \  
     && rm -rf \
         /var/lib/apt/lists/* \
         /tmp/* \
@@ -49,11 +52,29 @@ RUN apt -qq update && \
         /usr/share/doc \
         /usr/share/doc-base
 
-RUN git clone https://github.com/att-comdev/shipyard.git /home/ubuntu/shipyard
+# Create shipyard user
+RUN useradd -ms /bin/bash shipyard
+
+# Clone the shipyard repository
+RUN git clone https://github.com/att-comdev/shipyard.git ${SHIPYARD_HOME}/shipyard
+
+# Copy entrypoint.sh to /home/shipyard
+COPY entrypoint.sh ${SHIPYARD_HOME}/entrypoint.sh
 
-WORKDIR /home/ubuntu/shipyard
+# Copy shipyard.conf to /home/shipyard
+COPY shipyard.conf ${SHIPYARD_HOME}/shipyard.conf
 
+# Change permissions
+RUN chown -R shipyard: ${SHIPYARD_HOME} \
+    && chmod +x ${SHIPYARD_HOME}/entrypoint.sh
+
+# Expose port 9000 for application
 EXPOSE 9000
 
-CMD ["/usr/bin/uwsgi","--http",":9000","-w","shipyard_airflow.shipyard","--callable","shipyard","--enable-threads","-L","--logto","uwsgi_shipyard.log"]
+# Set work directory
+USER shipyard
+WORKDIR ${SHIPYARD_HOME}/shipyard
+
+# Execute entrypoint
+ENTRYPOINT ["/home/shipyard/entrypoint.sh"]
 

shipyard/README.md

@@ -0,0 +1,4 @@
+## Shipyard ##
+
+Shipyard dockerfiles
+

shipyard/entrypoint.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Copyright 2017 AT&T Intellectual Property.  All other rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Start shipyard application
+/usr/local/bin/uwsgi --http :9000 -w shipyard_airflow.shipyard --callable shipyard --enable-threads -L
+

shipyard/shipyard.conf

@@ -0,0 +1,3 @@
+[BASE]
+WEB_SERVER=http://localhost:32080
+