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

Commit 1417697

Browse files
thespadthespad
authored
Merge pull request #10 from linuxserver/alpine3.15
2 parents d4d35c4 + 96d8d54 commit 1417697

File tree

7 files changed

+125
-102
lines changed

7 files changed

+125
-102
lines changed

Diff for: ‎Dockerfile

+37-30
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,51 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:3.11
2-
MAINTAINER chbmb
1+
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
32

43
# set version label
54
ARG BUILD_DATE
65
ARG VERSION
76
ARG NNTP2NNTP_RELEASE
87
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8+
LABEL maintainer="chbmb"
99

1010
# install build packages
1111
RUN \
12-
apk add --no-cache --virtual=build-dependencies \
13-
curl \
14-
g++ \
15-
gcc \
16-
libffi-dev \
17-
libressl-dev \
18-
make \
19-
python2-dev \
20-
tar && \
21-
# install runtime packages
22-
apk add --no-cache \
23-
libffi \
24-
libressl \
25-
py2-pip && \
26-
# install nntp2nntp via pip package manager
27-
if [ -z ${NNTP2NNTP_RELEASE+x} ]; then \
28-
NNTP2NNTP_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/nntp2nntp/releases/latest" \
29-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
30-
fi && \
31-
pip install --no-cache-dir -U \
32-
https://github.com/linuxserver/nntp2nntp/archive/${NNTP2NNTP_RELEASE}.tar.gz \
33-
service_identity && \
34-
# cleanup
35-
apk del --purge \
36-
build-dependencies && \
37-
rm -rf \
38-
/root/.cache \
39-
/tmp/*
12+
apk add --no-cache --virtual=build-dependencies \
13+
cargo \
14+
g++ \
15+
gcc \
16+
libffi-dev \
17+
libressl-dev \
18+
make \
19+
musl-dev \
20+
openssl-dev \
21+
python2-dev \
22+
tar && \
23+
# install runtime packages
24+
apk add --no-cache \
25+
libffi \
26+
libressl \
27+
python2 && \
28+
# install pip
29+
curl -o /tmp/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
30+
python /tmp/get-pip.py && \
31+
# install nntp2nntp via pip package manager
32+
if [ -z ${NNTP2NNTP_RELEASE+x} ]; then \
33+
NNTP2NNTP_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/nntp2nntp/releases/latest" \
34+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
35+
fi && \
36+
pip install --no-cache-dir -U --find-links https://wheel-index.linuxserver.io/alpine-3.15/ \
37+
https://github.com/linuxserver/nntp2nntp/archive/${NNTP2NNTP_RELEASE}.tar.gz \
38+
service_identity && \
39+
# cleanup
40+
apk del --purge \
41+
build-dependencies && \
42+
rm -rf \
43+
/root/.cache \
44+
/tmp/*
45+
4046
# add local files
4147
COPY root/ /
48+
4249
# ports and volumes
4350
EXPOSE 1563
4451
VOLUME /config

Diff for: ‎Dockerfile.aarch64

+37-30
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,51 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.11
2-
MAINTAINER chbmb
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
32

43
# set version label
54
ARG BUILD_DATE
65
ARG VERSION
76
ARG NNTP2NNTP_RELEASE
87
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8+
LABEL maintainer="chbmb"
99

1010
# install build packages
1111
RUN \
12-
apk add --no-cache --virtual=build-dependencies \
13-
curl \
14-
g++ \
15-
gcc \
16-
libffi-dev \
17-
libressl-dev \
18-
make \
19-
python2-dev \
20-
tar && \
21-
# install runtime packages
22-
apk add --no-cache \
23-
libffi \
24-
libressl \
25-
py2-pip && \
26-
# install nntp2nntp via pip package manager
27-
if [ -z ${NNTP2NNTP_RELEASE+x} ]; then \
28-
NNTP2NNTP_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/nntp2nntp/releases/latest" \
29-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
30-
fi && \
31-
pip install --no-cache-dir -U \
32-
https://github.com/linuxserver/nntp2nntp/archive/${NNTP2NNTP_RELEASE}.tar.gz \
33-
service_identity && \
34-
# cleanup
35-
apk del --purge \
36-
build-dependencies && \
37-
rm -rf \
38-
/root/.cache \
39-
/tmp/*
12+
apk add --no-cache --virtual=build-dependencies \
13+
cargo \
14+
g++ \
15+
gcc \
16+
libffi-dev \
17+
libressl-dev \
18+
make \
19+
musl-dev \
20+
openssl-dev \
21+
python2-dev \
22+
tar && \
23+
# install runtime packages
24+
apk add --no-cache \
25+
libffi \
26+
libressl \
27+
python2 && \
28+
# install pip
29+
curl -o /tmp/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
30+
python /tmp/get-pip.py && \
31+
# install nntp2nntp via pip package manager
32+
if [ -z ${NNTP2NNTP_RELEASE+x} ]; then \
33+
NNTP2NNTP_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/nntp2nntp/releases/latest" \
34+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
35+
fi && \
36+
pip install --no-cache-dir -U \
37+
https://github.com/linuxserver/nntp2nntp/archive/${NNTP2NNTP_RELEASE}.tar.gz \
38+
service_identity && \
39+
# cleanup
40+
apk del --purge \
41+
build-dependencies && \
42+
rm -rf \
43+
/root/.cache \
44+
/tmp/*
45+
4046
# add local files
4147
COPY root/ /
48+
4249
# ports and volumes
4350
EXPOSE 1563
4451
VOLUME /config

Diff for: ‎Dockerfile.armhf

+37-30
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,51 @@
1-
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.11
2-
MAINTAINER chbmb
1+
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
32

43
# set version label
54
ARG BUILD_DATE
65
ARG VERSION
76
ARG NNTP2NNTP_RELEASE
87
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8+
LABEL maintainer="chbmb"
99

1010
# install build packages
1111
RUN \
12-
apk add --no-cache --virtual=build-dependencies \
13-
curl \
14-
g++ \
15-
gcc \
16-
libffi-dev \
17-
libressl-dev \
18-
make \
19-
python2-dev \
20-
tar && \
21-
# install runtime packages
22-
apk add --no-cache \
23-
libffi \
24-
libressl \
25-
py2-pip && \
26-
# install nntp2nntp via pip package manager
27-
if [ -z ${NNTP2NNTP_RELEASE+x} ]; then \
28-
NNTP2NNTP_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/nntp2nntp/releases/latest" \
29-
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
30-
fi && \
31-
pip install --no-cache-dir -U \
32-
https://github.com/linuxserver/nntp2nntp/archive/${NNTP2NNTP_RELEASE}.tar.gz \
33-
service_identity && \
34-
# cleanup
35-
apk del --purge \
36-
build-dependencies && \
37-
rm -rf \
38-
/root/.cache \
39-
/tmp/*
12+
apk add --no-cache --virtual=build-dependencies \
13+
cargo \
14+
g++ \
15+
gcc \
16+
libffi-dev \
17+
libressl-dev \
18+
make \
19+
musl-dev \
20+
openssl-dev \
21+
python2-dev \
22+
tar && \
23+
# install runtime packages
24+
apk add --no-cache \
25+
libffi \
26+
libressl \
27+
python2 && \
28+
# install pip
29+
curl -o /tmp/get-pip.py https://bootstrap.pypa.io/pip/2.7/get-pip.py && \
30+
python /tmp/get-pip.py && \
31+
# install nntp2nntp via pip package manager
32+
if [ -z ${NNTP2NNTP_RELEASE+x} ]; then \
33+
NNTP2NNTP_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/nntp2nntp/releases/latest" \
34+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
35+
fi && \
36+
pip install --no-cache-dir -U \
37+
https://github.com/linuxserver/nntp2nntp/archive/${NNTP2NNTP_RELEASE}.tar.gz \
38+
service_identity && \
39+
# cleanup
40+
apk del --purge \
41+
build-dependencies && \
42+
rm -rf \
43+
/root/.cache \
44+
/tmp/*
45+
4046
# add local files
4147
COPY root/ /
48+
4249
# ports and volumes
4350
EXPOSE 1563
4451
VOLUME /config

Diff for: ‎Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ pipeline {
720720
-e DO_REGION="ams3" \
721721
-e DO_BUCKET="lsio-ci" \
722722
-t ghcr.io/linuxserver/ci:latest \
723-
python /ci/ci.py'''
723+
python3 test_build.py'''
724724
}
725725
}
726726
}

Diff for: ‎README.md

+1
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
241241

242242
## Versions
243243

244+
* **10.10.22:** - Rebase to Alpine 3.15.
244245
* **19.12.19:** - Rebasing to alpine 3.11.
245246
* **28.06.19:** - Rebasing to alpine 3.10.
246247
* **23.04.19:** - Multiarch builds and build from Github fork.

Diff for: ‎readme-vars.yml

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ app_setup_block: |
4949
```
5050
# changelog
5151
changelogs:
52+
- { date: "10.10.22:", desc: "Rebase to Alpine 3.15." }
5253
- { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
5354
- { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
5455
- { date: "23.04.19:", desc: "Multiarch builds and build from Github fork." }

Diff for: ‎root/etc/cont-init.d/30-config

100644100755
+11-11
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22

33
# create keys
44
[[ ! -d /config/keys ]] && \
5-
mkdir -p \
6-
/config/keys
5+
mkdir -p \
6+
/config/keys
77

88
[[ ! -e /config/keys/certificate.pem ]] && \
9-
libressl req -x509 -nodes -days 3650 \
10-
-newkey rsa:2048 -keyout /config/keys/private-key.pem -out /config/keys/certificate.pem \
11-
-subj "/CN=nntp2nntp"
9+
libressl req -x509 -nodes -days 3650 \
10+
-newkey rsa:2048 -keyout /config/keys/private-key.pem -out /config/keys/certificate.pem \
11+
-subj "/CN=nntp2nntp"
1212

1313
# Create subfolder
1414
[[ ! -d /config/logs ]] && \
15-
mkdir -p \
16-
/config/logs
15+
mkdir -p \
16+
/config/logs
1717

1818
# Test for stale pid file and delete if found
1919
[[ -f /config/logs/nntp2nntp.pid ]] && \
20-
rm /config/logs/nntp2nntp.pid
20+
rm /config/logs/nntp2nntp.pid
2121

2222
# Check if config exists in /config, copy if not
2323
[[ ! -e /config/nntp2nntp.conf ]] && \
24-
cp /defaults/nntp2nntp.conf /config/nntp2nntp.conf
24+
cp /defaults/nntp2nntp.conf /config/nntp2nntp.conf
2525

2626
# permissions
2727
chown -R abc:abc \
28-
/config
28+
/config
2929
chmod u+rw \
30-
/config/nntp2nntp.conf
30+
/config/nntp2nntp.conf
3131

3232
# nntp2nntp cannot run in the foreground which means we cannot use services.d without constantly spawning duplicate processes
3333
# as a working compromise we launch the daemon from here at the cost of no service monitoring

0 commit comments

Comments
 (0)