Merge branch 'master' into next_release · 5363e1c73a - docker-devpi - Dank

Merge branch 'master' into next_release

master

Adam Hunter 10 years ago

parent

2264aefc4b 4f8d92c20f

commit

5363e1c73a

1 changed files with 1 additions and 0 deletions

Unified View

								
									1

Dockerfile

									View File
								
				@ -23,6 +23,7 @@ ENV PATH $VIRTUAL_ENV/bin:$PATH
			
				RUN pip install $ARG_PIP_OPTS \
				
				RUN pip install $ARG_PIP_OPTS \
			
				    "devpi-client==2.6.3" \
				
				    "devpi-client==2.6.3" \
			
				    "devpi-web==3.1.0" \
			
				    "devpi-server==$DEVPI_VERSION"
				
				    "devpi-server==$DEVPI_VERSION"
			
				EXPOSE 3141
				
				EXPOSE 3141