diff --git a/.travis.yml b/.travis.yml index 40fbc6be..3e0b1daa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ jobs: services: - docker language: generic - before_install: docker pull cartoimages/engine-xenial-pg101 + before_install: docker pull carto/nodejs6-xenial-pg101 script: npm run docker-test - dist: precise addons: diff --git a/docker/Dockerfile-xenial-pg101 b/docker/Dockerfile-nodejs6-xenial-pg101 similarity index 100% rename from docker/Dockerfile-xenial-pg101 rename to docker/Dockerfile-nodejs6-xenial-pg101 diff --git a/docker/reference.md b/docker/reference.md index 2d22e858..3c49c433 100644 --- a/docker/reference.md +++ b/docker/reference.md @@ -4,16 +4,20 @@ After running the tests with docker, you will need Docker installed and the dock `sudo apt install docker.io && sudo usermod -aG docker $(whoami)` ## Download image -`docker pull cartoimages/engine-xenial-pg101` +`docker pull carto/IMAGE` + +## Carto account +https://hub.docker.com/r/carto/ ## Update image - Edit the docker image file with your desired changes - Build image: - - `docker build -t cartoimages/engine-xenial-pg101 -f docker/Dockerfile-xenial-pg101 docker/` + - `docker build -t carto/IMAGE -f docker/DOCKER_FILE docker/` + - Upload to docker hub: - Login into docker hub: - `docker login` - Create tag: - - `docker tag cartoimages/engine-xenial-pg101 cartoimages/engine-xenial-pg101` + - `docker tag carto/IMAGE carto/IMAGE` - Upload: - - `docker push cartoimages/engine-xenial-pg101` + - `docker push carto/IMAGE` diff --git a/package.json b/package.json index 050998f1..1387632c 100644 --- a/package.json +++ b/package.json @@ -65,8 +65,8 @@ "preinstall": "make pre-install", "test": "make test-all", "update-internal-deps": "rm -rf node_modules && rm -f yarn.lock && yarn", - "docker-test": "docker run -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v", - "docker-bash": "docker run -it -v `pwd`:/srv cartoimages/engine-xenial-pg101 bash" + "docker-test": "docker run -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs -r docker rm -v", + "docker-bash": "docker run -it -v `pwd`:/srv carto/nodejs6-xenial-pg101 bash" }, "engines": { "node": ">=6.9",