Skip to content

Commit

Permalink
clean up/bugfix docker build (#892)
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenolen committed Apr 27, 2016
1 parent 1310006 commit db3e0a0
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1 @@
.git/objects/pack
.git/objects/pack/*
50 changes: 9 additions & 41 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,52 +1,20 @@
FROM debian:jessie
FROM tomcat:7
MAINTAINER Steve Nolen <[email protected]>
# Report issues here: https://github.com/ohmage/server

RUN set -x \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
&& apt-get install -y openjdk-7-jdk ant curl libtcnative-1 netcat git mysql-client\
&& apt-get install --no-install-recommends -y openjdk-7-jdk ant ant-optional netcat git\
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/* \
&& rm -rf /usr/local/tomcat/webapps/ROOT \
&& rm -rf /usr/local/tomcat/webapps/docs \
&& rm -rf /usr/local/tomcat/webapps/examples \
&& rm -rf /usr/local/tomcat/webapps/manager \
&& rm -rf /usr/local/tomcat/webapps/host-manager


# download tomcat
ENV CATALINA_HOME /usr/local/tomcat
ENV PATH $CATALINA_HOME/bin:$PATH
RUN mkdir -p "$CATALINA_HOME"
WORKDIR $CATALINA_HOME

# see https://www.apache.org/dist/tomcat/tomcat-8/KEYS
RUN gpg --keyserver pool.sks-keyservers.net --recv-keys \
05AB33110949707C93A279E3D3EFE6B686867BA6 \
07E48665A34DCAFAE522E5E6266191C37C037D42 \
47309207D818FFD8DCD3F83F1931D684307A10A5 \
541FBE7D8F78B25E055DDEE13C370389288584E7 \
61B832AC2F1C5A90F0F9B00A1C506407564C17A3 \
713DA88BE50911535FE716F5208B0AB1D63011C7 \
79F7026C690BAA50B92CD8B66A3AD3F4F22C4FED \
9BA44C2621385CB966EBA586F72C284D731FABEE \
A27677289986DB50844682F8ACB77FC2E86E29AC \
A9C5DF4D22E99998D9875A5110C01C5A2F6059E7 \
DCFD35E0BF8CA7344752DE8B6FB21E8933C60243 \
F3A04C595DB5B6A5F1ECA43E3B7BBB100D811BBE \
F7DA48BB64BCB84ECBA7EE6935CD23C10D498E23

ENV TOMCAT_MAJOR 7
ENV TOMCAT_VERSION 7.0.67
ENV TOMCAT_TGZ_URL https://www.apache.org/dist/tomcat/tomcat-$TOMCAT_MAJOR/v$TOMCAT_VERSION/bin/apache-tomcat-$TOMCAT_VERSION.tar.gz

RUN set -x \
&& curl -fSL "$TOMCAT_TGZ_URL" -o tomcat.tar.gz \
&& curl -fSL "$TOMCAT_TGZ_URL.asc" -o tomcat.tar.gz.asc \
&& gpg --verify tomcat.tar.gz.asc \
&& tar -xvf tomcat.tar.gz --strip-components=1 \
&& rm bin/*.bat \
&& rm tomcat.tar.gz* \
&& rm -rf /usr/local/tomcat/webapps/ROOT \
&& rm -rf /usr/local/tomcat/webapps/docs \
&& rm -rf /usr/local/tomcat/webapps/examples \
&& rm -rf /usr/local/tomcat/webapps/manager \
&& rm -rf /usr/local/tomcat/webapps/host-manager

#### download flyway (ohmage doesn't do migrations) ####
WORKDIR /flyway
Expand Down
9 changes: 5 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<property file="build.properties"/>
<property name="library" location="lib"/>
<property name="app_name" value="ohmage"/>
<property name="app_version" value="2.18.0"/>
<property name="app_version" value="2.18.1"/>
<property name="src" location="src"/>
<property name="test" location="test"/>
<property name="view" location="view"/>
Expand Down Expand Up @@ -238,6 +238,7 @@ by opening it in Eclipse and using Eclipse's aut-correct functionality to clean
it up and remove the warnings.</echo>
</target>

<!-- dist-ssl compilation process is deprecated. please use SSL via a reverse proxy -->
<target name="dist-ssl" depends="test, javac" description="Compiles Java files and creates WAR.">
<mkdir dir="${dist}"/>
<exec executable="git" outputproperty="git.revision" failifexecutionfails="true">
Expand Down Expand Up @@ -272,9 +273,9 @@ it up and remove the warnings.</echo>
<target name="dist-no_ssl" depends="test, javac" description="Compiles Java files and creates WAR.">
<mkdir dir="${dist}"/>
<exec executable="git" outputproperty="git.revision" failifexecutionfails="true">
<arg value="log"/>
<arg value="--pretty=format:%h"/>
<arg value="-1"/>
<arg value="rev-parse"/>
<arg value="--short"/>
<arg value="HEAD"/>
</exec>
<propertyfile file="system.properties" comment="This file is automatically generated - DO NOT EDIT!">
<entry key="application.name" default="${app_name}"/>
Expand Down
26 changes: 13 additions & 13 deletions docker_entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@

set -e

# set these to support both --link (deprecated) and newer network container communication.
DB_HOST=mysql
DB_PORT=3306

# use passed env variable or defaults
DB_HOST=$MYSQL_PORT_3306_TCP_ADDR
DB_PORT=$MYSQL_PORT_3306_TCP_PORT
DB_NAME=${DB_NAME:-ohmage}
DB_USER=${DB_USER:-ohmage}
DB_PASS=${DB_PASS:-ohmage}
MYSQL_DATABASE=${MYSQL_DATABASE:-ohmage}
MYSQL_USER=${MYSQL_USER:-ohmage}
MYSQL_PASSWORD=${MYSQL_PASSWORD:-ohmage}
FQDN=${FQDN:-$HOSTNAME}
LOG_LEVEL=${LOG_LEVEL:-WARN}
ESCAPED_PW=${DB_PASS/\&/\\&}

# cat out ohmage.conf
echo "#
# DATABASE
#
db.driver=com.mysql.jdbc.Driver
db.jdbcurl=jdbc:mysql://$DB_HOST:$DB_PORT/$DB_NAME?characterEncoding=utf8
db.username=$DB_USER
db.password=$ESCAPED_PW
db.jdbcurl=jdbc:mysql://$DB_HOST:$DB_PORT/$MYSQL_DATABASE?characterEncoding=utf8
db.username=$MYSQL_USER
db.password=$MYSQL_PASSWORD
#
# LOGGING
#
Expand All @@ -43,9 +44,9 @@ fi

# cat out flyway.conf
# note that the placeholders wont be updated at each boot.
echo "flyway.url=jdbc:mysql://$DB_HOST:$DB_PORT/$DB_NAME
flyway.user=$DB_USER
flyway.password=$DB_PASS
echo "flyway.url=jdbc:mysql://$DB_HOST:$DB_PORT/$MYSQL_DATABASE
flyway.user=$MYSQL_USER
flyway.password=$MYSQL_PASSWORD
flyway.placeholders.fqdn=$FQDN
flyway.placeholders.base_dir=/var/lib/ohmage" > /flyway/conf/flyway.conf

Expand All @@ -57,7 +58,6 @@ do
sleep 1
done
echo 'mysql available.'
mysql -uroot -p$MYSQL_ENV_MYSQL_ROOT_PASSWORD -h$DB_HOST -P$DB_PORT mysql -e "CREATE DATABASE IF NOT EXISTS $DB_NAME; grant all on $DB_NAME.* to \"$DB_USER\"@\"%\" IDENTIFIED BY \"$DB_PASS\"; FLUSH PRIVILEGES;"

# execute migrations
/flyway/flyway migrate
Expand Down

0 comments on commit db3e0a0

Please sign in to comment.