Compare commits
	
		
			3 commits
		
	
	
		
			5ba45ade2a
			...
			a6f800a2a3
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a6f800a2a3 | |||
| 9e24d19593 | |||
| 7fa5af6694 | 
					 2 changed files with 2 additions and 5 deletions
				
			
		|  | @ -12,14 +12,11 @@ steps: | ||||||
|       from_secret: docker_password |       from_secret: docker_password | ||||||
|     REGISTRY: |     REGISTRY: | ||||||
|       from_secret: docker_registry |       from_secret: docker_registry | ||||||
|     DOCKER_CLI_LOCATION: |  | ||||||
|       from_secret: docker-cli-location |  | ||||||
|   volumes: |   volumes: | ||||||
|   - name: dockersock |   - name: dockersock | ||||||
|     path: /var/run |     path: /var/run | ||||||
|   commands: |   commands: | ||||||
|   - apk add make git |   - apk add make git | ||||||
|   - 'export PATH="$${DOCKER_CLI_LOCATION}":"$${PATH}"' |  | ||||||
|   - 'while [ "$(docker info >/dev/null 2>&1; echo $?)" -ne 0 ]; do sleep 1; done' |   - 'while [ "$(docker info >/dev/null 2>&1; echo $?)" -ne 0 ]; do sleep 1; done' | ||||||
|   - echo login $REGISTRY |   - echo login $REGISTRY | ||||||
|   - docker login -u $USERNAME -p $PASSWORD $REGISTRY |   - docker login -u $USERNAME -p $PASSWORD $REGISTRY | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								Makefile
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								Makefile
									
										
									
									
									
								
							|  | @ -127,7 +127,7 @@ STAMPS = $(foreach outbin,$(OUTBINS),.go/$(outbin).stamp) | ||||||
| $(STAMPS): go-build | $(STAMPS): go-build | ||||||
| 	@echo "binary: $(OUTBIN)" | 	@echo "binary: $(OUTBIN)" | ||||||
| 	@if ! cmp -s .go/$(OUTBIN) $(OUTBIN); then  \
 | 	@if ! cmp -s .go/$(OUTBIN) $(OUTBIN); then  \
 | ||||||
| 	    mv .go/$(OUTBIN) $(OUTBIN);             \
 | 	    mv -f .go/$(OUTBIN) $(OUTBIN);          \
 | ||||||
| 	    date >$@;                               \
 | 	    date >$@;                               \
 | ||||||
| 	fi | 	fi | ||||||
| 
 | 
 | ||||||
|  | @ -254,7 +254,7 @@ test: $(BUILD_DIRS) | ||||||
| 	@$(DKR) run                                                 \
 | 	@$(DKR) run                                                 \
 | ||||||
| 	    -i                                                      \
 | 	    -i                                                      \
 | ||||||
| 	    --rm                                                    \
 | 	    --rm                                                    \
 | ||||||
| 	    -u $$(id -u):$$(id -g)                                  \
 | 	    -u $(UID):$(GID)                                        \
 | ||||||
| 	    -v $$(pwd):/src                                         \
 | 	    -v $$(pwd):/src                                         \
 | ||||||
| 	    -w /src                                                 \
 | 	    -w /src                                                 \
 | ||||||
| 	    -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin                \
 | 	    -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin                \
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue