Skip to content

Commit 5416f1b

Browse files
authored
feat(loong64): use beige as base image (#26)
1 parent b984130 commit 5416f1b

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ jobs:
1212
arch:
1313
- alpine-arm64
1414
- alpine-x64
15+
- beige-loong64
16+
- beige-devtoolset-loong64
1517
# - bionic-devtoolset-ppc64le
1618
- focal-arm64
1719
- focal-armhf
@@ -24,8 +26,6 @@ jobs:
2426
- focal-devtoolset-riscv64
2527
- focal-devtoolset-s390x
2628
- focal-devtoolset-x64
27-
# - trixie-loong64
28-
- trixie-devtoolset-loong64
2929

3030
steps:
3131
- uses: actions/checkout@v3

trixie-devtoolset-loong64/Dockerfile renamed to beige-devtoolset-loong64/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
ARG REPO=loongarch64/debian
2-
ARG TAG=latest
1+
ARG REPO=linuxdeepin/deepin
2+
ARG TAG=beige-loong64-v1.4.0
33
FROM ${REPO}:${TAG}
44

55
ARG DEBIAN_FRONTEND=noninteractive
66
ARG NODE_VERSION="20.16.0"
77

8-
RUN apt-get update && \
8+
RUN echo 'deb http://mirrors.kernel.org/deepin/beige beige main commercial community' > /etc/apt/sources.list && \
9+
apt-get update && \
910
apt-get install -y --no-install-recommends \
1011
binutils \
1112
build-essential \
1213
git \
1314
pkg-config \
1415
fakeroot \
15-
rpm \
1616
sudo \
1717
apt-transport-https \
1818
ca-certificates \

trixie-loong64/Dockerfile renamed to beige-loong64/Dockerfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG REPO=debian
2-
ARG TAG=unstable
1+
ARG REPO=linuxdeepin/deepin
2+
ARG TAG=beige-amd64-v1.4.0
33
FROM ${REPO}:${TAG}
44

55
ARG DOCKER_CE_VERSION=27.3.1
@@ -10,19 +10,19 @@ ARG DOCKER_CE_VERSION=27.3.1
1010

1111
ENV DEBIAN_FRONTEND=noninteractive
1212
RUN dpkg --add-architecture loong64 && \
13+
echo 'deb [arch=amd64,i386,loong64] http://mirrors.kernel.org/deepin/beige beige main commercial community' > /etc/apt/sources.list && \
1314
apt-get update && \
14-
apt-get install -y debian-ports-archive-keyring && \
15-
echo "deb [arch=loong64] http://ftp.ports.debian.org/debian-ports sid main" >> /etc/apt/sources.list && \
16-
apt-get update && \
17-
apt-get install -y --no-install-recommends \
18-
gcc-14-loongarch64-linux-gnu \
19-
g++-14-loongarch64-linux-gnu \
15+
# --force-overwrite to work around a strange error:
16+
# dpkg: error processing archive /tmp/apt-dpkg-install-sG9gCG/20-linux-libc-dev_23.01.01.18_amd64.deb (--unpack):
17+
# trying to overwrite shared '/usr/share/doc/linux-libc-dev/changelog.gz', which is different from other instances of package linux-libc-dev:amd64
18+
apt-get install -y -f -o Dpkg::Options::="--force-overwrite" --no-install-recommends \
19+
gcc-12-loongarch64-linux-gnu \
20+
g++-12-loongarch64-linux-gnu \
2021
binutils-loongarch64-linux-gnu \
2122
build-essential \
2223
git \
2324
pkg-config \
2425
fakeroot \
25-
rpm \
2626
sudo \
2727
apt-transport-https \
2828
ca-certificates \
@@ -63,8 +63,8 @@ RUN gcc --version && \
6363

6464
ENV AS=/usr/bin/loongarch64-linux-gnu-as \
6565
AR=/usr/bin/loongarch64-linux-gnu-ar \
66-
CC=/usr/bin/loongarch64-linux-gnu-gcc-14 \
67-
CPP=/usr/bin/loongarch64-linux-gnu-cpp-14 \
68-
CXX=/usr/bin/loongarch64-linux-gnu-g++-14 \
66+
CC=/usr/bin/loongarch64-linux-gnu-gcc-12 \
67+
CPP=/usr/bin/loongarch64-linux-gnu-cpp-12 \
68+
CXX=/usr/bin/loongarch64-linux-gnu-g++-12 \
6969
LD=/usr/bin/loongarch64-linux-gnu-ld \
7070
PKG_CONFIG_PATH=/usr/lib/loongarch64-linux-gnu/pkgconfig

0 commit comments

Comments
 (0)