Merge branch 'registry' into 'registry'
Fix SSL error and upgrade Hugo to 0.27.1 and improve build workflow See merge request pages/hugo!37
This commit is contained in:
		
						commit
						a76cc016b8
					
				@ -4,17 +4,31 @@ image: docker:latest
 | 
				
			|||||||
# improved performance.
 | 
					# improved performance.
 | 
				
			||||||
variables:
 | 
					variables:
 | 
				
			||||||
  DOCKER_DRIVER: overlay
 | 
					  DOCKER_DRIVER: overlay
 | 
				
			||||||
  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
 | 
					  IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
 | 
				
			||||||
 | 
					  IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  - docker:dind
 | 
					  - docker:dind
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					stages:
 | 
				
			||||||
 | 
					  - test
 | 
				
			||||||
 | 
					  - deploy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
before_script:
 | 
					before_script:
 | 
				
			||||||
  - docker info
 | 
					  - docker info
 | 
				
			||||||
  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 | 
					  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 | 
				
			||||||
 | 
					
 | 
				
			||||||
build:
 | 
					test:
 | 
				
			||||||
  stage: build
 | 
					  stage: test
 | 
				
			||||||
  script:
 | 
					  script:
 | 
				
			||||||
    - docker build -t $IMAGE_TAG .
 | 
					    - docker build -t $IMAGE_NAME .
 | 
				
			||||||
    - docker push $IMAGE_TAG
 | 
					    - docker run -v `pwd`:/git $IMAGE_NAME /bin/sh -c "wget -qO- https://fedoraproject.org/static/hotspot.txt | grep OK && cd /git && hugo"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					deploy:
 | 
				
			||||||
 | 
					  stage: deploy
 | 
				
			||||||
 | 
					  script:
 | 
				
			||||||
 | 
					    - docker build -t $IMAGE_NAME -t $IMAGE_LATEST .
 | 
				
			||||||
 | 
					    - docker push $IMAGE_NAME
 | 
				
			||||||
 | 
					    - docker push $IMAGE_LATEST
 | 
				
			||||||
 | 
					  only:
 | 
				
			||||||
 | 
					    - tags
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								Dockerfile
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								Dockerfile
									
									
									
									
									
								
							@ -1,18 +1,18 @@
 | 
				
			|||||||
FROM alpine:latest
 | 
					FROM alpine:latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
ENV HUGO_VERSION 0.26
 | 
					ENV HUGO_VERSION 0.27.1
 | 
				
			||||||
ENV HUGO_SHA 67e4ba5ec2a02c8164b6846e30a17cc765b0165a5b183d5e480149baf54e1a50
 | 
					ENV HUGO_SHA 0e6cb63e6aca10277b96023c4fed97ac3a3e922d12f073b8a80630946fe289e7
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Install HUGO
 | 
					# Install HUGO
 | 
				
			||||||
RUN set -eux && \
 | 
					RUN set -eux && \
 | 
				
			||||||
    apk add --update --no-cache --virtual .fetch-deps \
 | 
					    apk add --update --no-cache \
 | 
				
			||||||
      ca-certificates \
 | 
					      ca-certificates \
 | 
				
			||||||
      openssl && \
 | 
					      openssl \
 | 
				
			||||||
 | 
					      git && \
 | 
				
			||||||
  wget -O ${HUGO_VERSION}.tar.gz https://github.com/spf13/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz && \
 | 
					  wget -O ${HUGO_VERSION}.tar.gz https://github.com/spf13/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz && \
 | 
				
			||||||
  echo "${HUGO_SHA}  ${HUGO_VERSION}.tar.gz" | sha256sum -c && \
 | 
					  echo "${HUGO_SHA}  ${HUGO_VERSION}.tar.gz" | sha256sum -c && \
 | 
				
			||||||
  tar xf ${HUGO_VERSION}.tar.gz && mv hugo* /usr/bin/hugo && \
 | 
					  tar xf ${HUGO_VERSION}.tar.gz && mv hugo* /usr/bin/hugo && \
 | 
				
			||||||
  rm -r ${HUGO_VERSION}.tar.gz && \
 | 
					  rm -r ${HUGO_VERSION}.tar.gz && \
 | 
				
			||||||
  apk del .fetch-deps && \
 | 
					 | 
				
			||||||
  rm /var/cache/apk/* && \
 | 
					  rm /var/cache/apk/* && \
 | 
				
			||||||
  hugo version
 | 
					  hugo version
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user