Skip to content

Commit 0893282

Browse files
authored
Merge pull request apinf#3745 from apinf/devops/docker-build-fail-1
Update .travis.yml
2 parents daf3277 + bc28f3d commit 0893282

File tree

3 files changed

+17
-25
lines changed

3 files changed

+17
-25
lines changed

.scripts/docker_build.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77

88
set -ev
99

10+
docker build -t apinf/platform:$DOCKER_TAG .
11+
1012
if [ "${TRAVIS_PULL_REQUEST}" = "false" -a "${TRAVIS_REPO_SLUG}" = "apinf/platform" ]
1113
then
12-
docker build -t apinf/platform:$DOCKER_TAG .
13-
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
14-
docker push apinf/platform:$DOCKER_TAG
14+
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
15+
docker push apinf/platform:$DOCKER_TAG
1516
fi

.travis.yml

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
sudo: false
2-
3-
group: deprecated-2017Q4
1+
dist: xenial
42

53
language: node_js
64
node_js:
75
- '8'
86

9-
addons:
10-
apt:
11-
sources:
12-
- ubuntu-toolchain-r-test
13-
packages:
14-
- g++-4.8
7+
addons:
158
chrome: stable
169

1710
branches:
@@ -21,40 +14,36 @@ branches:
2114
before_cache:
2215
- rm -f $HOME/.meteor/log/*.log
2316

24-
cache:
25-
yarn: true
26-
directories:
27-
- $HOME/.meteor
28-
2917
services:
3018
- docker
19+
- xvfb
3120

3221
before_install:
3322
- ls -la
23+
- sudo apt-get update
24+
- sudo apt-get install g++ build-essential xvfb
25+
3426
# Install meteor locally on CI
3527
- if [ ! -e "$HOME/.meteor/meteor" ]; then cat .travis_install_meteor | sed s/--progress-bar/-sL/g | /bin/sh; fi
3628

3729

3830
before_script:
3931
#Previously used yarn, but now after migrating to meteor 1.8, yarn fails to create some binaries.
4032
- meteor npm install
41-
- yarn run lint
33+
- npm run lint
4234
- npm view chimp version
4335
- npm view chromedriver version
44-
# Start X Virtual Frame Buffer for headless testing with real browsers
45-
- ./.scripts/start-xvfb.sh
46-
36+
4737
install:
4838
- export PATH="$HOME/.meteor:$PATH"
4939

5040
script:
5141
# Run meteor and chimp from node.js
52-
- travis_retry yarn test
42+
- travis_retry npm run test
5343
# Build docker image
5444
- ./.scripts/docker_build.sh
5545

5646
env:
5747
global:
5848
- DISPLAY=:99.0
59-
- TEST_MODE: "true"
60-
- CXX=g++-4.8
49+
- TEST_MODE: "true"

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# A base Docker image for Meteor applications. https://hub.docker.com/r/jshimko/meteor-launchpad/
2-
FROM jshimko/meteor-launchpad:latest
2+
#FROM jshimko/meteor-launchpad:latest - jessie deps
3+
#FROM abernix/meteord:onbuild - is not starting
4+
FROM pixolution/meteor-launchpad:v2.3.1
35
# the version (that bit after :) is dependent somehow on meteor versions. it used to be 1.1.1 but now as we go for Meteor 1.8, let's use latest.
46
# If you get in trouble with starting Meteor, this might be something to look at
57
MAINTAINER apinf <info@apinf.io>

0 commit comments

Comments
 (0)