mirror of
				https://github.com/netbox-community/netbox.git
				synced 2024-05-10 07:54:54 +00:00 
			
		
		
		
	Removed Docker bits from CI build
This commit is contained in:
		
							
								
								
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								.travis.yml
									
									
									
									
									
								
							@@ -1,12 +1,6 @@
 | 
			
		||||
sudo: required
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  - docker
 | 
			
		||||
  - postgresql
 | 
			
		||||
 | 
			
		||||
env:
 | 
			
		||||
  - DOCKER_TAG=$TRAVIS_TAG
 | 
			
		||||
 | 
			
		||||
language: python
 | 
			
		||||
python:
 | 
			
		||||
  - "2.7"
 | 
			
		||||
@@ -18,7 +12,3 @@ addons:
 | 
			
		||||
  - postgresql: "9.4"
 | 
			
		||||
script:
 | 
			
		||||
  - ./scripts/cibuild.sh
 | 
			
		||||
after_success:
 | 
			
		||||
  - if [ ! -z "$TRAVIS_TAG" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
 | 
			
		||||
    ./scripts/docker-build.sh;
 | 
			
		||||
    fi
 | 
			
		||||
 
 | 
			
		||||
@@ -1,21 +0,0 @@
 | 
			
		||||
#!/bin/bash
 | 
			
		||||
 | 
			
		||||
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
 | 
			
		||||
if [ $? -ne 0 ]; then
 | 
			
		||||
  echo "docker login failed."
 | 
			
		||||
  exit 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
docker build -t "$DOCKER_REPOSITORY/$DOCKER_IMAGE_NAME:$DOCKER_TAG" .
 | 
			
		||||
if [ $? -ne 0 ]; then
 | 
			
		||||
  echo "docker build failed."
 | 
			
		||||
  exit 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
docker push "$DOCKER_REPOSITORY/$DOCKER_IMAGE_NAME:$DOCKER_TAG"
 | 
			
		||||
if [ $? -ne 0 ]; then
 | 
			
		||||
  echo "docker push failed."
 | 
			
		||||
  exit 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
exit 0
 | 
			
		||||
		Reference in New Issue
	
	Block a user