Skip to content
This repository was archived by the owner on Feb 17, 2023. It is now read-only.

Commit b7b5b80

Browse files
thespadthespad
authored
Merge pull request #38 from linuxserver/armless
2 parents 2904b56 + a082761 commit b7b5b80

File tree

7 files changed

+65
-63
lines changed

7 files changed

+65
-63
lines changed

‎Dockerfile‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ FROM ghcr.io/linuxserver/baseimage-ubuntu:focal
44
ARG DEBIAN_FRONTEND="noninteractive"
55

66
RUN \
7-
echo "**** install apt-transport-https ****" && \
8-
apt-get update && \
9-
apt-get install -y apt-transport-https && \
10-
echo "**** add mono repository ****" && \
11-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
12-
echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
13-
echo "**** install packages ****" && \
14-
apt-get update && \
15-
apt-get install -y \
16-
--no-install-recommends \
17-
--no-install-suggests \
18-
ca-certificates-mono \
19-
libcurl4-openssl-dev \
20-
mono-devel \
21-
mono-vbnc && \
22-
echo "**** clean up ****" && \
23-
rm -rf \
24-
/tmp/* \
25-
/var/lib/apt/lists/* \
26-
/var/tmp/*
7+
echo "**** install apt-transport-https ****" && \
8+
apt-get update && \
9+
apt-get install -y apt-transport-https && \
10+
echo "**** add mono repository ****" && \
11+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
12+
echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
13+
echo "**** install packages ****" && \
14+
apt-get update && \
15+
apt-get install -y \
16+
--no-install-recommends \
17+
--no-install-suggests \
18+
ca-certificates-mono \
19+
libcurl4-openssl-dev \
20+
mono-runtime \
21+
mono-vbnc && \
22+
echo "**** clean up ****" && \
23+
rm -rf \
24+
/tmp/* \
25+
/var/lib/apt/lists/* \
26+
/var/tmp/*

‎Dockerfile.aarch64‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal
44
ARG DEBIAN_FRONTEND="noninteractive"
55

66
RUN \
7-
echo "**** install apt-transport-https ****" && \
8-
apt-get update && \
9-
apt-get install -y apt-transport-https && \
10-
echo "**** add mono repository ****" && \
11-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
12-
echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
13-
echo "**** install packages ****" && \
14-
apt-get update && \
15-
apt-get install -y \
16-
--no-install-recommends \
17-
--no-install-suggests \
18-
ca-certificates-mono \
19-
libcurl4-openssl-dev \
20-
mono-devel \
21-
mono-vbnc && \
22-
echo "**** clean up ****" && \
23-
rm -rf \
24-
/tmp/* \
25-
/var/lib/apt/lists/* \
26-
/var/tmp/*
7+
echo "**** install apt-transport-https ****" && \
8+
apt-get update && \
9+
apt-get install -y apt-transport-https && \
10+
echo "**** add mono repository ****" && \
11+
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
12+
echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
13+
echo "**** install packages ****" && \
14+
apt-get update && \
15+
apt-get install -y \
16+
--no-install-recommends \
17+
--no-install-suggests \
18+
ca-certificates-mono \
19+
libcurl4-openssl-dev \
20+
mono-runtime \
21+
mono-vbnc && \
22+
echo "**** clean up ****" && \
23+
rm -rf \
24+
/tmp/* \
25+
/var/lib/apt/lists/* \
26+
/var/tmp/*

‎Dockerfile.armhf‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,4 @@ FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal
33
# environment settings
44
ARG DEBIAN_FRONTEND="noninteractive"
55

6-
RUN \
7-
echo "**** install apt-transport-https ****" && \
8-
apt-get update && \
9-
apt-get install -y apt-transport-https && \
10-
echo "**** add mono repository ****" && \
11-
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF && \
12-
echo "deb http://download.mono-project.com/repo/ubuntu stable-focal main" | tee /etc/apt/sources.list.d/mono-official.list && \
13-
echo "**** install packages ****" && \
14-
apt-get update && \
15-
apt-get install -y \
16-
--no-install-recommends \
17-
--no-install-suggests \
18-
ca-certificates-mono \
19-
libcurl4-openssl-dev \
20-
mono-devel \
21-
mono-vbnc && \
22-
echo "**** clean up ****" && \
23-
rm -rf \
24-
/tmp/* \
25-
/var/lib/apt/lists/* \
26-
/var/tmp/*
6+
COPY /root-armhf /

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pipeline {
3131
CI_PORT='80'
3232
CI_SSL='true'
3333
CI_DELAY='30'
34-
CI_DOCKERENV='TZ=US/Pacific'
34+
CI_DOCKERENV='TZ=US/Pacific|ISCI=true'
3535
CI_AUTH='user:password'
3636
CI_WEBPATH=''
3737
}

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ repo_vars:
2121
- CI_PORT='80'
2222
- CI_SSL='true'
2323
- CI_DELAY='30'
24-
- CI_DOCKERENV='TZ=US/Pacific'
24+
- CI_DOCKERENV='TZ=US/Pacific|ISCI=true'
2525
- CI_AUTH='user:password'
2626
- CI_WEBPATH=''

‎root-armhf/etc/cont-init.d/50-armless‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
cat <<-EOF
4+
********************************************************
5+
********************************************************
6+
* *
7+
* !!!! *
8+
* This base image no longers supports *
9+
* 32 bit ARM due to a lack of upstream packages *
10+
* *
11+
* *
12+
********************************************************
13+
********************************************************
14+
EOF

‎root-armhf/etc/services.d/armless/run‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/usr/bin/with-contenv bash
2+
3+
if [[ -n $ISCI ]]; then
4+
sleep 60
5+
fi
6+
7+
exec \
8+
s6-svscanctl -t /run/service/

0 commit comments

Comments
 (0)