Skip to content
This repository was archived by the owner on Jun 22, 2024. It is now read-only.

Commit 407e981

Browse files
committed
Sync with upstream
1 parent 8248dd7 commit 407e981

File tree

3 files changed

+2
-7
lines changed

3 files changed

+2
-7
lines changed

.github/workflows/scan-dockerfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
format: 'sarif'
3939
output: 'source-results.sarif'
4040
scanners: 'vuln,secret,misconfig'
41-
skip-dirs: 'tests,Video,NodeChromium,NodeFirefox'
41+
skip-dirs: 'tests,Video'
4242
exit-code: '${{ env.EXIT_CODE }}'
4343
severity: '${{ env.SEVERITY }}'
4444
limit-severities-for-sarif: true

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ all_multi: base_multi \
155155
sessions_multi \
156156
sessionqueue_multi \
157157
event_bus_multi \
158-
uploader_multi \
159158
video_multi
160159

161160
build_multi: all_multi
@@ -204,9 +203,6 @@ standalone_chromium_multi: chromium_multi
204203
standalone_docker_multi: docker_multi
205204
cd ./StandaloneDocker && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) $(FROM_IMAGE_ARGS) -t $(NAME)/standalone-docker:$(TAG_VERSION) .
206205

207-
uploader_multi:
208-
cd ./Uploader && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg BASED_TAG=$(RCLONE_BASED_TAG) -t $(NAME)/uploader:$(RCLONE_TAG_VERSION)-$(BUILD_DATE) .
209-
210206
video_multi:
211207
cd ./Video && docker buildx build --platform $(PLATFORMS) $(BUILD_ARGS) --build-arg NAMESPACE=$(FFMPEG_BASED_NAME) --build-arg BASED_TAG=$(FFMPEG_BASED_TAG) -t $(NAME)/video:$(FFMPEG_TAG_VERSION)-$(BUILD_DATE) .
212208

NodeBase/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ RUN apt-get -qqy update \
8888
fonts-ipafont-gothic \
8989
fonts-wqy-zenhei \
9090
fonts-tlwg-loma-otf \
91-
# ttf-ubuntu-font-family \
92-
# fonts-ubuntu \
91+
#fonts-ubuntu \
9392
fonts-noto-color-emoji \
9493
&& rm -rf /var/lib/apt/lists/* \
9594
&& apt-get -qyy clean

0 commit comments

Comments
 (0)