Skip to content

Commit

Permalink
Docker: Updated output to include troubleshooting
Browse files Browse the repository at this point in the history
  • Loading branch information
Jesse Olsen committed Jul 31, 2017
1 parent 6292a49 commit 64bd8bb
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 43 deletions.
58 changes: 29 additions & 29 deletions Dockerfile-core
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@

FROM alpine:3.5

COPY docker_entry.sh /usr/local/bin/
COPY docker_go.sh /go.sh

RUN adduser -Ds /bin/bash docker

###############################################################################
Expand Down Expand Up @@ -51,7 +48,7 @@ RUN npm config set https-proxy $http_proxy

# 3. Install Hubot

RUN npm install -g yo generator-hubot
RUN npm install -g yo generator-hubot css-what css-select

###############################################################################
USER docker
Expand Down Expand Up @@ -82,16 +79,16 @@ RUN cd /usr/lib/node_modules/npm; npm install fs-extra; \
USER docker


RUN npm install [email protected]; \
npm install hubot-test-helper@^1.3.0; \
npm install amqp@^0.2.6; \
npm install d3@^4.2.7; \
npm install jsdom@^9.8.0; \
npm install svg2png@^4.0.0; \
npm install [email protected]; \
npm install nlp_compromise@^6.5.0; \
npm install request@^2.75.0; \
npm install request-promise@^4.1.1;
RUN npm install [email protected] \
hubot-test-helper@^1.3.0 \
amqp@^0.2.6 \
d3@^4.2.7 \
jsdom@^9.8.0 \
svg2png@^4.0.0 \
[email protected] \
nlp_compromise@^6.5.0 \
request@^2.75.0 \
request-promise@^4.1.1;


RUN npm install babel-plugin-transform-function-bind; \
Expand Down Expand Up @@ -120,21 +117,21 @@ RUN npm install -g gulp; \
npm install gulp-task-listing@^1.0.1; \
npm install gulp-util@^3.0.7

RUN npm install [email protected]; \
npm install hubot-test-helper@^1.3.0; \
npm install amqp@^0.2.6; \
npm install d3@^4.2.7; \
npm install jsdom@^9.8.0; \
npm install svg2png@^4.0.0; \
npm install [email protected]; \
npm install nlp_compromise@^6.5.0; \
npm install request@^2.75.0; \
npm install request-promise@^4.1.1; \
npm install babel-core; \
npm install babel-plugin-transform-function-bind; \
npm install babel-preset-es2015@^6.16.0; \
npm install babel-register; \
npm install del@^2.2.2;
RUN npm install [email protected] \
hubot-test-helper@^1.3.0 \
amqp@^0.2.6 \
d3@^4.2.7 \
jsdom@^9.8.0 \
svg2png@^4.0.0 \
[email protected] \
nlp_compromise@^6.5.0 \
request@^2.75.0 \
request-promise@^4.1.1 \
babel-core \
babel-plugin-transform-function-bind \
babel-preset-es2015@^6.16.0 \
babel-register \
del@^2.2.2;


# 5. Copy config file
Expand All @@ -143,5 +140,8 @@ RUN npm install [email protected]; \
# 8. Run bin/hubot (docker_go.sh handles this, called by docker_run.sh)
# 9. Test your bot (instructions presented by docker_go.sh)

COPY docker_entry.sh /usr/local/bin/
COPY docker_go.sh /go.sh

ENTRYPOINT ["sh", "/usr/local/bin/docker_entry.sh"]

4 changes: 3 additions & 1 deletion docker_entry.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash
su docker -c "/go.sh"
sh
if [ $? -ne 10 ]; then
sh
fi
83 changes: 70 additions & 13 deletions docker_go.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,75 @@ echo "## MERGED (js -s add LOCAL GIT_REPO) ##----------------------------------"
cat /home/docker/hubot/oneview-configuration.json
echo "-------------------------------------------------------------------------"
echo ""
echo "##################################################################"
echo " HUBOT_NAME: ${HUBOT_NAME}"
echo " If HUBOT_NAME is empty, be sure to export HUBOT_NAME"
echo " in your environment."
echo " "
echo " Once you see: Connected to SCMB, waiting for messages..."
echo " Test hubot with:"
echo " [ENTER] (to see prompt...)"
echo " ${HUBOT_NAME}> @${HUBOT_NAME} list all hardware"
echo " TO EXIT: ^C (or exit), [ENTER], exit"
echo " - OR -"
echo " TO RESTART after code changes: ^C, [ENTER], /go.sh"
echo "##################################################################"


if [[ -z ${HUBOT_NAME} ]]; then
echo "##################################################################"
echo "!!! HUBOT_NAME variable MUST BE SET!!";
echo "##################################################################"
exit 1;
fi

if [[ -z ${PARMS} ]]; then
echo "##################################################################"
echo " HUBOT_NAME: ${HUBOT_NAME}"
echo " "
echo " Once you see: Connected to SCMB, waiting for messages..."
echo " Test hubot with:"
echo " [ENTER] (to see prompt...)"
echo " ${HUBOT_NAME}> @${HUBOT_NAME} help"
echo " TO EXIT: ^C (or exit), [ENTER], exit"
echo " - OR -"
echo " TO RESTART after code changes: ^C, [ENTER], /go.sh"
echo "##################################################################"
else
if [[ ${PARMS} = "-a hipchat" ]]; then
if [[ -z ${HUBOT_HIPCHAT_JID} ]]; then
echo "##################################################################"
echo "!!! HUBOT_HIPCHAT_JID variable MUST BE SET!!";
echo "##################################################################"
exit 10;
fi
if [[ -z ${HUBOT_HIPCHAT_PASSWORD} ]]; then
echo "##################################################################"
echo "!!! HUBOT_HIPCHAT_PASSWORD variable MUST BE SET!!";
echo "##################################################################"
exit 10;
fi
fi

if [[ ${PARMS} = "-a slack" ]]; then
if [[ -z ${HUBOT_SLACK_TOKEN} ]]; then
echo "##################################################################"
echo "!!! HUBOT_SLACK_TOKEN variable MUST BE SET!!";
echo "##################################################################"
exit 10;
fi
fi

echo "##################################################################"
echo " HUBOT_NAME: ${HUBOT_NAME}"
echo " "
echo " Once you see: How can I assist you?"
echo " "
echo " Then respond as instructed in the client window."
echo " "
echo " TROUBLESHOOTING:"
echo " "
echo " If you get no response,"
echo " try 'help' with and without @BOT-NAME ..."
echo " "
echo " If you see: tunneling socket could not be established"
echo " Double check you have a valid IP (not 0.0.0.0)"
echo " "
echo " If it just hangs, and you don't see How can I assist you?"
echo " ... did you forget to set the proxy variables?"
echo " http_proxy"
echo " https_proxy"
echo " no_proxy"
echo " "
echo "##################################################################"
fi


bin/hubot --name $HUBOT_NAME $PARMS

0 comments on commit 64bd8bb

Please sign in to comment.