From a8ba02051b261a634050ea7f621451d84ca61607 Mon Sep 17 00:00:00 2001
From: syeopite <syeopite@syeopite.dev>
Date: Wed, 26 Jul 2023 07:25:19 -0700
Subject: [PATCH] Remove(?) lsquic from make and docker files
---
.github/workflows/container-release.yml | 29 ++-----------------------
Makefile | 6 -----
docker/Dockerfile | 11 +---------
docker/Dockerfile.arm64 | 11 +---------
4 files changed, 4 insertions(+), 53 deletions(-)
diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml
index 86aec94f..13bbf34c 100644
--- a/.github/workflows/container-release.yml
+++ b/.github/workflows/container-release.yml
@@ -52,7 +52,7 @@ jobs:
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_PASSWORD }}
- - name: Build and push Docker AMD64 image without QUIC for Push Event
+ - name: Build and push Docker AMD64 image for Push Event
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
with:
@@ -64,9 +64,8 @@ jobs:
tags: quay.io/invidious/invidious:${{ github.sha }},quay.io/invidious/invidious:latest
build-args: |
"release=1"
- "disable_quic=1"
- - name: Build and push Docker ARM64 image without QUIC for Push Event
+ - name: Build and push Docker ARM64 image for Push Event
if: github.ref == 'refs/heads/master'
uses: docker/build-push-action@v3
with:
@@ -78,28 +77,4 @@ jobs:
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
diff --git a/Makefile b/Makefile
index d4657792..9eb195df 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,6 @@
RELEASE := 1
STATIC := 0
-DISABLE_QUIC := 1
NO_DBG_SYMBOLS := 0
@@ -27,10 +26,6 @@ else
FLAGS += --debug
endif
-ifeq ($(DISABLE_QUIC), 1)
- FLAGS += -Ddisable_quic
-endif
-
ifeq ($(API_ONLY), 1)
FLAGS += -Dapi_only
endif
@@ -115,7 +110,6 @@ help:
@echo " STATIC Link libraries statically (Default: 0)"
@echo ""
@echo " API_ONLY Build invidious without a GUI (Default: 0)"
- @echo " DISABLE_QUIC Disable support for QUIC (Default: 0)"
@echo " NO_DBG_SYMBOLS Strip debug symbols (Default: 0)"
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 57864883..761bbdca 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,15 +2,12 @@ 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
COPY ./shard.lock ./shard.lock
RUN shards install --production
-COPY --from=quay.io/invidious/lsquic-compiled /root/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a
-
COPY ./src/ ./src/
# TODO: .git folder is required for building – this is destructive.
# See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.
@@ -24,13 +21,7 @@ COPY ./videojs-dependencies.yml ./videojs-dependencies.yml
RUN crystal spec --warnings all \
--link-flags "-lxml2 -llzma"
-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 \
+RUN if [[ "${release}" == 1 ]] ; then \
crystal build ./src/invidious.cr \
--release \
--static --warnings all \
diff --git a/docker/Dockerfile.arm64 b/docker/Dockerfile.arm64
index 10135efb..cf9231fb 100644
--- a/docker/Dockerfile.arm64
+++ b/docker/Dockerfile.arm64
@@ -2,15 +2,12 @@ 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
COPY ./shard.lock ./shard.lock
RUN shards install --production
-COPY --from=quay.io/invidious/lsquic-compiled /root/liblsquic.a ./lib/lsquic/src/lsquic/ext/liblsquic.a
-
COPY ./src/ ./src/
# TODO: .git folder is required for building – this is destructive.
# See definition of CURRENT_BRANCH, CURRENT_COMMIT and CURRENT_VERSION.
@@ -24,13 +21,7 @@ COPY ./videojs-dependencies.yml ./videojs-dependencies.yml
RUN crystal spec --warnings all \
--link-flags "-lxml2 -llzma"
-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 \
+RUN if [[ "${release}" == 1 ]] ; then \
crystal build ./src/invidious.cr \
--release \
--static --warnings all \