fixup the CI registry (thanks @sascha.herzinger)
This commit is contained in:
		
							parent
							
								
									6074868276
								
							
						
					
					
						commit
						1f8ec3aaae
					
				| 
						 | 
					@ -1,42 +1,24 @@
 | 
				
			||||||
 | 
					image: docker:20.10.16
 | 
				
			||||||
image: docker:19.03.0
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
variables:
 | 
					variables:
 | 
				
			||||||
  # When using dind service, we need to instruct docker, to talk with
 | 
					 | 
				
			||||||
  # the daemon started inside of the service. The daemon is available
 | 
					 | 
				
			||||||
  # with a network connection instead of the default
 | 
					 | 
				
			||||||
  # /var/run/docker.sock socket. docker:19.03.1 does this automatically
 | 
					 | 
				
			||||||
  # by setting the DOCKER_HOST in
 | 
					 | 
				
			||||||
  # https://github.com/docker-library/docker/blob/d45051476babc297257df490d22cbd806f1b11e4/19.03.1/docker-entrypoint.sh#L23-L29
 | 
					 | 
				
			||||||
  #
 | 
					 | 
				
			||||||
  # The 'docker' hostname is the alias of the service container as described at
 | 
					 | 
				
			||||||
  # https://docs.gitlab.com/ee/ci/docker/using_docker_images.html#accessing-the-services.
 | 
					 | 
				
			||||||
  #
 | 
					 | 
				
			||||||
  # Note that if you're using the Kubernetes executor, the variable
 | 
					 | 
				
			||||||
  # should be set to tcp://localhost:2376/ because of how the
 | 
					 | 
				
			||||||
  # Kubernetes executor connects services to the job container
 | 
					 | 
				
			||||||
  #DOCKER_HOST: tcp://localhost:2376/
 | 
					 | 
				
			||||||
  #
 | 
					 | 
				
			||||||
  # When using dind, it's wise to use the overlayfs driver for
 | 
					 | 
				
			||||||
  # improved performance.
 | 
					 | 
				
			||||||
  DOCKER_DRIVER: overlay2
 | 
					  DOCKER_DRIVER: overlay2
 | 
				
			||||||
  # Specify to Docker where to create the certificates, Docker will
 | 
					 | 
				
			||||||
  # create them automatically on boot, and will create
 | 
					 | 
				
			||||||
  # `/certs/client` that will be shared between the service and job
 | 
					 | 
				
			||||||
  # container, thanks to volume mount from config.toml
 | 
					 | 
				
			||||||
  DOCKER_TLS_CERTDIR: ""
 | 
					  DOCKER_TLS_CERTDIR: ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  - name: docker:19.03.0-dind
 | 
					  - name: repomanager.lcsb.uni.lu:9999/library/docker:20.10.16-dind
 | 
				
			||||||
    command: ["--mtu=1458"]
 | 
					    command: ["--mtu=1458", "--registry-mirror", "https://repomanager.lcsb.uni.lu:9999"]
 | 
				
			||||||
 | 
					    alias: docker
 | 
				
			||||||
 | 
					
 | 
				
			||||||
build_image:
 | 
					stages:
 | 
				
			||||||
  before_script:
 | 
					  - build
 | 
				
			||||||
    - echo -n $DOCKER_AUTH_TOKEN | docker login -u exaexa --password-stdin $CI_REGISTRY
 | 
					
 | 
				
			||||||
 | 
					build:
 | 
				
			||||||
 | 
					  stage: build
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - docker build -t $CI_REGISTRY_IMAGE .
 | 
					    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
 | 
				
			||||||
    - docker push $CI_REGISTRY_IMAGE
 | 
					    - docker build -t $CI_REGISTRY_IMAGE:latest .
 | 
				
			||||||
 | 
					    - docker push $CI_REGISTRY_IMAGE:latest
 | 
				
			||||||
 | 
					  rules:
 | 
				
			||||||
 | 
					    - if: '$CI_COMMIT_REF_NAME == "master"'
 | 
				
			||||||
  tags:
 | 
					  tags:
 | 
				
			||||||
    - privileged
 | 
					    - privileged
 | 
				
			||||||
  artifacts:
 | 
					 | 
				
			||||||
    expire_in: 1 week
 | 
					 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue