academy/mq-container
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor corrections

Browse Source
This commit is contained in:
Riccardo Biraghi
2018-04-23 15:07:36 +01:00
parent c9e7ae194e
commit 1cba663922
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -15,11 +15,7 @@ cache:
env: env:
- DOCKER_DOWNGRADE="echo nothing to be done" - DOCKER_DOWNGRADE="echo nothing to be done"
- DOCKER_DOWNGRADE="sudo apt-get autoremove -y docker-ce & - DOCKER_DOWNGRADE="sudo apt-get autoremove -y docker-ce && curl -fsSL \"https://apt.dockerproject.org/gpg\" | sudo apt-key add - && sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" && sudo apt-get update && sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs)"
curl -fsSL https://apt.dockerproject.org/gpg | sudo apt-key add - &
sudo apt-add-repository \"deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main\" &
sudo apt-get update &
sudo apt-get install docker-engine=1.12.6-0~ubuntu-$(lsb_release -cs)"
before_install: before_install:
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
@@ -38,7 +34,7 @@ script:
- make vet - make vet
- make build-devserver - make build-devserver
- make build-devjmstest - make build-devjmstest
- $DOCKER_DOWNGRADE - eval "$DOCKER_DOWNGRADE"
- echo Running $(docker --version) - echo Running $(docker --version)
- make test-devserver - make test-devserver

2
Makefile
View File

@@ -47,7 +47,7 @@ ARCH = $(shell uname -m)
BUILD_SERVER_CONTAINER=build-server BUILD_SERVER_CONTAINER=build-server
# NUM_CPU is the number of CPUs available to Docker. Used to control how many # NUM_CPU is the number of CPUs available to Docker. Used to control how many
# test run in parallel # test run in parallel
NUM_CPU=$(shell docker info --format "{{ .NCPU }}") NUM_CPU=$(shell docker info --format "{{ .NCPU }}" || 1)
# BASE_IMAGE_TAG is a normalized version of BASE_IMAGE, suitable for use in a Docker tag # BASE_IMAGE_TAG is a normalized version of BASE_IMAGE, suitable for use in a Docker tag
BASE_IMAGE_TAG=$(subst /,-,$(subst :,-,$(BASE_IMAGE))) BASE_IMAGE_TAG=$(subst /,-,$(subst :,-,$(BASE_IMAGE)))
MQ_IMAGE_DEVSERVER_BASE=mqadvanced-server-dev-base:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG) MQ_IMAGE_DEVSERVER_BASE=mqadvanced-server-dev-base:$(MQ_VERSION)-$(ARCH)-$(BASE_IMAGE_TAG)