Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate uglify in web server image creation #205

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
62c6765
Integrate uglify in web server image creation
kriskowal May 20, 2014
40f934e
Remove unneeded JSHint global comment
Stuk Jun 17, 2014
0359dee
Migrate to DigitalOcean v2 API
Aug 15, 2017
96cc895
Update tugboat usage
Aug 15, 2017
a0cc6f6
update container and base image nodejs version from 0.10.x to 4.x
hthetiot Aug 15, 2017
37e97d8
fix container file-service error when saving file #251
hthetiot Aug 15, 2017
9c13208
Merge branch 'master' of github.com:montagestudio/firefly
hthetiot Aug 15, 2017
de32d9d
.travis.yml
hthetiot Aug 15, 2017
71305e1
update travis build
hthetiot Aug 15, 2017
f00e167
fix [project] - *uncaughtException* [TypeError: Constructor Map requi…
hthetiot Aug 15, 2017
a87d298
log uncaughtException on project and login
hthetiot Aug 15, 2017
aa0663a
add uncaughtException stack to logs
hthetiot Aug 15, 2017
b2742be
fix Object.map usage from old collections
hthetiot Aug 16, 2017
8dc0505
Set working CDN to download Serf
Aug 15, 2017
c26006f
Fix creation of admin user
Aug 15, 2017
75ddd5f
npm install filament during deployment
Aug 16, 2017
4f6c23c
Update SSL certificates
Aug 16, 2017
3681a13
Improve deploying instructions in README
Aug 16, 2017
e017670
s/lilac/miranda/
Aug 16, 2017
04685ba
Clean up README
Aug 16, 2017
04fb900
Merge pull request #254 from montagestudio/bugs/uncaughtException
cdebost Aug 17, 2017
c6ff61e
fix review #249
hthetiot Aug 29, 2017
ff3203d
trim whitespaces
hthetiot Aug 29, 2017
5a2e59d
jshint
hthetiot Aug 29, 2017
f6bf5e7
fix travis
hthetiot Aug 29, 2017
891e0f5
update jshint
hthetiot Aug 29, 2017
352b862
Merge branch 'master' of github.com:montagestudio/firefly
hthetiot Aug 29, 2017
b2c03df
Merge branch 'master' into features/container-update
hthetiot Aug 29, 2017
3fc2ecd
Merge branch 'master' into bugs/collections-upgrade
hthetiot Aug 29, 2017
fe49d54
fix duplicate jshint in package.json
hthetiot Aug 29, 2017
9200dda
Merge branch 'master' into bugs/collections-upgrade
hthetiot Aug 29, 2017
cd081ac
Merge branch 'master' into features/container-update
hthetiot Aug 29, 2017
3687049
add travis badge
hthetiot Aug 29, 2017
76c3180
jshint
hthetiot Aug 29, 2017
a1edba6
Merge pull request #255 from montagestudio/bugs/collections-upgrade
cdebost Aug 29, 2017
fac567c
Merge pull request #249 from montagestudio/features/container-update
cdebost Aug 29, 2017
f2ed77d
Merge branch 'master' into uglify-web-server-image
hthetiot Aug 29, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .jshintrc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"xit": false,
"expect": false,
"spyOn": false,

"URL": true,
"WeakMap": true,
"Map": true,
"Set": true,
Expand Down
44 changes: 44 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
sudo: required
dist: trusty
language: node_js
node_js:
- "4"
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
# Update docker-engine using Ubuntu 'trusty' apt repo
- >
curl -sSL "https://get.docker.com/gpg" |
sudo -E apt-key add -
- >
echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" |
sudo tee -a /etc/apt/sources.list
- sudo apt-get update
- >
sudo apt-get -o Dpkg::Options::="--force-confdef" \
-o Dpkg::Options::="--force-confold" --assume-yes --allow-unauthenticated install docker-engine
- docker version
# Update docker-compose via pip
- sudo pip install docker-compose
- docker-compose version
# NodeJS Install
- "npm install"
# Update public certs
- sudo update-ca-certificates --verbose
addons:
hosts:
- local-aurora.montagestudio.com
before_script:
# - export DISPLAY=:99.0
# - sh -e /etc/init.d/xvfb start
# - docker build -t firefly-container:0.1 -f Dockerfile .
# - docker run -t --name firefly-container firefly-container:0.1
# - sleep 25
script:
- npm run lint
# TODO provide server to run test
# - npm run test
after_script:
- docker stop firefly-container
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
#
# VERSION 1.1

# TODO move to 16.04 LTS
FROM ubuntu:14.04
MAINTAINER Pierre Chaussalet <pchaussalet@montagestudio.com>
MAINTAINER Harold Thetiot <harold.thetiot@montagestudio.com>

# Updates
RUN apt-get update
Expand All @@ -13,11 +14,9 @@ RUN apt-get install -y sudo curl git zip && \
apt-get clean

# Node
RUN apt-get install -y python-software-properties python g++ make software-properties-common && \
apt-get clean
RUN add-apt-repository ppa:chris-lea/node.js
RUN apt-get update
RUN apt-get install -y nodejs&& \
RUN curl -sL https://deb.nodesource.com/setup_4.x -o nodesource_setup.sh
RUN sudo bash nodesource_setup.sh
RUN apt-get install -y nodejs build-essential && \
apt-get clean

RUN adduser --disabled-password --gecos "" montage
Expand All @@ -36,6 +35,7 @@ RUN git clone https://github.com/montagejs/popcorn.git /home/montage/popcorn
RUN git --git-dir /home/montage/popcorn/.git remote rm origin

# Install glTFConverter converter
## TODO fix libpng12 on ubuntu 16+ https://askubuntu.com/questions/840257/e-package-libpng12-0-has-no-installation-candidate-ubuntu-16-10-gnome/840268
RUN apt-get install -y libxml2-dev libpng12-dev libpcre3-dev cmake&& \
apt-get clean
RUN git clone https://github.com/KhronosGroup/glTF.git /home/montage/glTF
Expand Down
Loading