mirror of
				https://github.com/iv-org/invidious.git
				synced 2025-10-26 18:58:28 -05:00 
			
		
		
		
	dockerfile: Pass '-Ddisable_quic' to 'crystal build'
+ use alpine 3.16 as a base like the crystal team
This commit is contained in:
		
							parent
							
								
									84cd4d6a5b
								
							
						
					
					
						commit
						ee719edb29
					
				
							
								
								
									
										34
									
								
								.github/workflows/container-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										34
									
								
								.github/workflows/container-release.yml
									
									
									
									
										vendored
									
									
								
							| @ -52,7 +52,7 @@ jobs: | ||||
|           username: ${{ secrets.QUAY_USERNAME }} | ||||
|           password: ${{ secrets.QUAY_PASSWORD }} | ||||
| 
 | ||||
|       - name: Build and push Docker AMD64 image for Push Event | ||||
|       - name: Build and push Docker AMD64 image without QUIC for Push Event | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         uses: docker/build-push-action@v3 | ||||
|         with: | ||||
| @ -62,9 +62,11 @@ jobs: | ||||
|           labels: quay.expires-after=12w | ||||
|           push: true | ||||
|           tags: quay.io/invidious/invidious:${{ github.sha }},quay.io/invidious/invidious:latest | ||||
|           build-args: release=1 | ||||
|           build-args: | | ||||
|             "release=1" | ||||
|             "disable_quic=1" | ||||
| 
 | ||||
|       - name: Build and push Docker ARM64 image for Push Event | ||||
|       - name: Build and push Docker ARM64 image without QUIC for Push Event | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         uses: docker/build-push-action@v3 | ||||
|         with: | ||||
| @ -74,4 +76,30 @@ jobs: | ||||
|           labels: quay.expires-after=12w | ||||
|           push: true | ||||
|           tags: quay.io/invidious/invidious:${{ github.sha }}-arm64,quay.io/invidious/invidious:latest-arm64 | ||||
|           build-args: | | ||||
|             "release=1" | ||||
|             "disable_quic=1" | ||||
|          | ||||
|       - name: Build and push Docker AMD64 image with QUIC for Push Event | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         uses: docker/build-push-action@v3 | ||||
|         with: | ||||
|           context: . | ||||
|           file: docker/Dockerfile | ||||
|           platforms: linux/amd64 | ||||
|           labels: quay.expires-after=12w | ||||
|           push: true | ||||
|           tags: quay.io/invidious/invidious:${{ github.sha }}-quic,quay.io/invidious/invidious:latest-quic | ||||
|           build-args: release=1 | ||||
| 
 | ||||
|       - name: Build and push Docker ARM64 image with QUIC for Push Event | ||||
|         if: github.ref == 'refs/heads/master' | ||||
|         uses: docker/build-push-action@v3 | ||||
|         with: | ||||
|           context: . | ||||
|           file: docker/Dockerfile.arm64 | ||||
|           platforms: linux/arm64/v8 | ||||
|           labels: quay.expires-after=12w | ||||
|           push: true | ||||
|           tags: quay.io/invidious/invidious:${{ github.sha }}-arm64-quic,quay.io/invidious/invidious:latest-arm64-quic | ||||
|           build-args: release=1 | ||||
|  | ||||
| @ -2,6 +2,7 @@ FROM crystallang/crystal:1.4.1-alpine AS builder | ||||
| RUN apk add --no-cache sqlite-static yaml-static | ||||
| 
 | ||||
| ARG release | ||||
| ARG disable_quic | ||||
| 
 | ||||
| WORKDIR /invidious | ||||
| COPY ./shard.yml ./shard.yml | ||||
| @ -23,7 +24,13 @@ COPY ./videojs-dependencies.yml ./videojs-dependencies.yml | ||||
| RUN crystal spec --warnings all \ | ||||
|     --link-flags "-lxml2 -llzma" | ||||
| 
 | ||||
| RUN if [ "${release}" == 1 ] ; then \ | ||||
| RUN if [[ "${release}" == 1 && "${disable_quic}" == 1 ]] ; then \ | ||||
|         crystal build ./src/invidious.cr \ | ||||
|         --release \ | ||||
|         -Ddisable_quic \ | ||||
|         --static --warnings all \ | ||||
|         --link-flags "-lxml2 -llzma"; \ | ||||
|     elif [[ "${release}" == 1 ]] ; then \ | ||||
|         crystal build ./src/invidious.cr \ | ||||
|         --release \ | ||||
|         --static --warnings all \ | ||||
| @ -35,7 +42,7 @@ RUN if [ "${release}" == 1 ] ; then \ | ||||
|     fi | ||||
| 
 | ||||
| 
 | ||||
| FROM alpine:latest | ||||
| FROM alpine:3.16 | ||||
| RUN apk add --no-cache librsvg ttf-opensans | ||||
| WORKDIR /invidious | ||||
| RUN addgroup -g 1000 -S invidious && \ | ||||
|  | ||||
| @ -2,6 +2,7 @@ FROM alpine:3.16 AS builder | ||||
| RUN apk add --no-cache 'crystal=1.4.1-r0' shards sqlite-static yaml-static yaml-dev libxml2-dev zlib-static openssl-libs-static openssl-dev musl-dev | ||||
| 
 | ||||
| ARG release | ||||
| ARG disable_quic | ||||
| 
 | ||||
| WORKDIR /invidious | ||||
| COPY ./shard.yml ./shard.yml | ||||
| @ -23,7 +24,13 @@ COPY ./videojs-dependencies.yml ./videojs-dependencies.yml | ||||
| RUN crystal spec --warnings all \ | ||||
|     --link-flags "-lxml2 -llzma" | ||||
| 
 | ||||
| RUN if [ ${release} == 1 ] ; then \ | ||||
| RUN if [[ "${release}" == 1 && "${disable_quic}" == 1 ]] ; then \ | ||||
|         crystal build ./src/invidious.cr \ | ||||
|         --release \ | ||||
|         -Ddisable_quic \ | ||||
|         --static --warnings all \ | ||||
|         --link-flags "-lxml2 -llzma"; \ | ||||
|     elif [[ "${release}" == 1 ]] ; then \ | ||||
|         crystal build ./src/invidious.cr \ | ||||
|         --release \ | ||||
|         --static --warnings all \ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user