Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

build: fix multiarch build

Browse Source 
TARGETPLATFORM must not have a default value.
This commit is contained in:
Saúl Ibarra Corretgé
2022-06-13 14:48:50 +02:00
parent 0572ab9c48
commit b227b73710
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -20,8 +20,7 @@ endif
BUILD_ARGS := \ BUILD_ARGS := \
--build-arg JITSI_REPO=$(JITSI_REPO) \ --build-arg JITSI_REPO=$(JITSI_REPO) \
--build-arg JITSI_RELEASE=$(JITSI_RELEASE) \ --build-arg JITSI_RELEASE=$(JITSI_RELEASE)
--build-arg TARGETPLATFORM=$(TARGETPLATFORM)
ifeq ($(FORCE_REBUILD), 1) ifeq ($(FORCE_REBUILD), 1)
BUILD_ARGS := $(BUILD_ARGS) --no-cache BUILD_ARGS := $(BUILD_ARGS) --no-cache
@@ -61,7 +60,7 @@ build:
else else
build: build:
@echo "Building for $(TARGETPLATFORM)" @echo "Building for $(TARGETPLATFORM)"
docker build $(BUILD_ARGS) --progress plain --tag $(JITSI_REPO)/$(JITSI_SERVICE) $(JITSI_SERVICE)/ docker build $(BUILD_ARGS) --build-arg TARGETPLATFORM=$(TARGETPLATFORM) --progress plain --tag $(JITSI_REPO)/$(JITSI_SERVICE) $(JITSI_SERVICE)/
endif endif
$(addprefix build_,$(JITSI_SERVICES)): $(addprefix build_,$(JITSI_SERVICES)):

2
jibri/Dockerfile
View File

@@ -12,7 +12,7 @@ RUN apt-dpkg-wrap apt-get update && \
apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri procps jitsi-upload-integrations jq && \ apt-dpkg-wrap apt-get install -y jibri libgl1-mesa-dri procps jitsi-upload-integrations jq && \
apt-cleanup apt-cleanup
ARG TARGETPLATFORM=unset ARG TARGETPLATFORM
ARG USE_CHROMIUM=0 ARG USE_CHROMIUM=0
#ARG CHROME_RELEASE=latest #ARG CHROME_RELEASE=latest
#ARG CHROMEDRIVER_MAJOR_RELEASE=latest #ARG CHROMEDRIVER_MAJOR_RELEASE=latest