Get rid of our internal "build system" and switch to a CI-buildable D…

…ockerfile instead.
refine · Jul 1, 2015 · 775bffe · 775bffe
1 parent f726c0a
commit 775bffe
Show file tree

Hide file tree

Showing 19 changed files with 43 additions and 367 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,14 @@
+*.mo
+*.tgz
+.DS_Store
+.env
+.git/
+.idea/
+Dockerfile
+node_modules/
+npm-debug.log
+res/bower_components/
+res/build/
+rethinkdb_data/
+temp/
+tmp/
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,6 @@
 .idea/
 /*.tgz
 /.env
-/.heroku/
 /doc/*.png
 /node_modules/
 /res/bower_components/

diff --git a/.npmignore b/.npmignore
@@ -5,14 +5,12 @@
 /.editorconfig
 /.env
 /.gitignore
-/.heroku/
 /.idea/
 /.jscsrc
 /.npmignore
 /.npmrc
 /Dockerfile
 /bower.json
-/buildpack/
 /component.json
 /doc/
 /gulpfile.js

diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,41 @@
 FROM sorccu/node:0.12.2
 MAINTAINER Simo Kinnunen
 
+# Install requirements.
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
     apt-get -y install libzmq3-dev libprotobuf-dev git graphicsmagick && \
     apt-get clean && \
     rm -rf /var/cache/apt/*
 
+# Add a user for the app.
+RUN useradd --system \
+      --no-create-home \
+      --shell /usr/sbin/nologin \
+      --home-dir /app \
+      stf
+
+# Sneak the stf executable into $PATH.
 ENV PATH /app/bin:$PATH
 
+# Work in app dir by default.
+WORKDIR /app
+
+# Export default app port, not enough for all processes but it should do
+# for now.
+EXPOSE 3000
+
+# Copy app source.
+COPY . /app/
+
+# Get the rest of the dependencies and build.
+RUN export PATH=/app/node_modules/.bin:$PATH && \
+    npm install && \
+    bower install --allow-root && \
+    gulp build
+
+# Switch to weak user.
+USER stf
+
+# Show help by default.
 CMD stf --help
diff --git a/buildpack/bin/common.sh b/buildpack/bin/common.sh
diff --git a/buildpack/bin/compact b/buildpack/bin/compact
diff --git a/buildpack/bin/compile b/buildpack/bin/compile
diff --git a/buildpack/buildpacks/bower/bin/common.sh b/buildpack/buildpacks/bower/bin/common.sh
diff --git a/buildpack/buildpacks/bower/bin/compile b/buildpack/buildpacks/bower/bin/compile
diff --git a/buildpack/buildpacks/bower/bin/detect b/buildpack/buildpacks/bower/bin/detect
diff --git a/buildpack/buildpacks/gulp/bin/common.sh b/buildpack/buildpacks/gulp/bin/common.sh
diff --git a/buildpack/buildpacks/gulp/bin/compile b/buildpack/buildpacks/gulp/bin/compile
diff --git a/buildpack/buildpacks/gulp/bin/detect b/buildpack/buildpacks/gulp/bin/detect
diff --git a/buildpack/buildpacks/node/README.md b/buildpack/buildpacks/node/README.md
diff --git a/buildpack/buildpacks/node/bin/common.sh b/buildpack/buildpacks/node/bin/common.sh
diff --git a/buildpack/buildpacks/node/bin/compact b/buildpack/buildpacks/node/bin/compact