Skip to content

Commit f6447bf

Browse files
danbevdanbev
committed
ci : enable https for the remaining jobs
1 parent 0c80780 commit f6447bf

File tree

2 files changed

+79
-5
lines changed

2 files changed

+79
-5
lines changed

‎.devops/main.Dockerfile‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
11
FROM ubuntu:22.04 AS build
22
WORKDIR /app
33

4+
# Set non-interactive frontend and install ca-certificates first
5+
ENV DEBIAN_FRONTEND=noninteractive
46
RUN apt-get update && \
5-
apt-get install -y build-essential wget cmake git \
6-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
7+
apt-get install -y ca-certificates && \
8+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list && \
9+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list && \
10+
apt-get update && \
11+
apt-get install -y build-essential wget cmake git \
12+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
713

8-
COPY .. .
14+
COPY . .
915
RUN make base.en
1016

1117
FROM ubuntu:22.04 AS runtime
1218
WORKDIR /app
1319

20+
# Set non-interactive frontend and install ca-certificates first
21+
ENV DEBIAN_FRONTEND=noninteractive
1422
RUN apt-get update && \
15-
apt-get install -y curl ffmpeg libsdl2-dev wget cmake git \
16-
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
23+
apt-get install -y ca-certificates && \
24+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list && \
25+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list && \
26+
apt-get update && \
27+
apt-get install -y curl ffmpeg libsdl2-dev wget cmake git \
28+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/archives/*
1729

1830
COPY --from=build /app /app
1931
ENV PATH=/app/build/bin:$PATH

‎.github/workflows/build.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ jobs:
101101
-v ${{ github.workspace }}:/workspace \
102102
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
103103
set -e
104+
export DEBIAN_FRONTEND=noninteractive
104105
105106
apt-get update
106107
apt-get install -y ca-certificates
@@ -137,6 +138,15 @@ jobs:
137138
-v ${{ github.workspace }}:/workspace \
138139
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
139140
set -e
141+
142+
export DEBIAN_FRONTEND=noninteractive
143+
144+
apt-get update
145+
apt-get install -y ca-certificates
146+
147+
# Switch to HTTPS mirrors
148+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
149+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
140150
apt update
141151
apt install -y build-essential libsdl2-dev cmake git
142152
cmake -B build -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8-a
@@ -165,6 +175,15 @@ jobs:
165175
-v ${{ github.workspace }}:/workspace \
166176
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
167177
set -e
178+
export DEBIAN_FRONTEND=noninteractive
179+
180+
apt-get update
181+
apt-get install -y ca-certificates
182+
183+
# Switch to HTTPS mirrors
184+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
185+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
186+
168187
apt update
169188
apt install -y build-essential libsdl2-dev cmake git
170189
cmake -B build -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv7-a+fp
@@ -250,6 +269,14 @@ jobs:
250269
-v ${{ github.workspace }}:/workspace \
251270
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
252271
set -e
272+
export DEBIAN_FRONTEND=noninteractive
273+
274+
apt-get update
275+
apt-get install -y ca-certificates
276+
277+
# Switch to HTTPS mirrors
278+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
279+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
253280
apt update
254281
apt install -y build-essential cmake libsdl2-dev git
255282
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }}
@@ -280,6 +307,14 @@ jobs:
280307
-v ${{ github.workspace }}:/workspace \
281308
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
282309
set -e
310+
export DEBIAN_FRONTEND=noninteractive
311+
312+
apt-get update
313+
apt-get install -y ca-certificates
314+
315+
# Switch to HTTPS mirrors
316+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
317+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
283318
apt update
284319
apt install -y build-essential cmake libsdl2-dev git
285320
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv8-a
@@ -310,6 +345,15 @@ jobs:
310345
-v ${{ github.workspace }}:/workspace \
311346
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
312347
set -e
348+
export DEBIAN_FRONTEND=noninteractive
349+
350+
apt-get update
351+
apt-get install -y ca-certificates
352+
353+
# Switch to HTTPS mirrors
354+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
355+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
356+
313357
apt update
314358
apt install -y build-essential cmake libsdl2-dev git
315359
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DGGML_NATIVE=OFF -DGGML_CPU_ARM_ARCH=armv7-a+fp
@@ -343,6 +387,15 @@ jobs:
343387
-v ${{ github.workspace }}:/workspace \
344388
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
345389
set -e
390+
export DEBIAN_FRONTEND=noninteractive
391+
392+
apt-get update
393+
apt-get install -y ca-certificates
394+
395+
# Switch to HTTPS mirrors
396+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
397+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
398+
346399
apt update
347400
apt install -y clang build-essential cmake libsdl2-dev git
348401
cmake . -DWHISPER_SDL2=ON -DCMAKE_BUILD_TYPE=${{ matrix.build }} -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
@@ -373,6 +426,15 @@ jobs:
373426
-v ${{ github.workspace }}:/workspace \
374427
-w /workspace ${{ env.ubuntu_image }} /bin/sh -c '
375428
set -e
429+
export DEBIAN_FRONTEND=noninteractive
430+
431+
apt-get update
432+
apt-get install -y ca-certificates
433+
434+
# Switch to HTTPS mirrors
435+
sed -i "s|http://archive.ubuntu.com|https://archive.ubuntu.com|g" /etc/apt/sources.list
436+
sed -i "s|http://security.ubuntu.com|https://security.ubuntu.com|g" /etc/apt/sources.list
437+
376438
apt update
377439
apt install -y build-essential cmake git
378440
cmake . -DCMAKE_BUILD_TYPE=Debug \

0 commit comments

Comments
 (0)