Skip to content

Commit d13ece8

Browse files
aptalcaaptalca
authored
Merge branch 'master' into master
2 parents b034f36 + 49c451d commit d13ece8

File tree

9 files changed

+144
-250
lines changed

9 files changed

+144
-250
lines changed

‎.github/ISSUE_TEMPLATE/issue.bug.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ body:
5353
options:
5454
- x86-64
5555
- arm64
56-
- armhf
5756
validations:
5857
required: true
5958
- type: textarea

‎Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -25,11 +25,11 @@ RUN \
2525
if [ -z ${LDAP_VERSION+x} ]; then \
2626
LDAP_VERSION=$(curl -sL https://pypi.python.org/pypi/python-ldap/json |jq -r '. | .info.version'); \
2727
fi && \
28-
python3 -m ensurepip && \
29-
pip3 install -U --no-cache-dir \
28+
python3 -m venv /lsiopy && \
29+
pip install -U --no-cache-dir \
3030
pip \
3131
wheel && \
32-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
32+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
3333
cryptography \
3434
python-ldap=="${LDAP_VERSION}" && \
3535
echo "**** cleanup ****" && \

‎Dockerfile.aarch64

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
44

55
# set version label
66
ARG BUILD_DATE
@@ -25,11 +25,11 @@ RUN \
2525
if [ -z ${LDAP_VERSION+x} ]; then \
2626
LDAP_VERSION=$(curl -sL https://pypi.python.org/pypi/python-ldap/json |jq -r '. | .info.version'); \
2727
fi && \
28-
python3 -m ensurepip && \
29-
pip3 install -U --no-cache-dir \
28+
python3 -m venv /lsiopy && \
29+
pip install -U --no-cache-dir \
3030
pip \
3131
wheel && \
32-
pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ \
32+
pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
3333
cryptography \
3434
python-ldap=="${LDAP_VERSION}" && \
3535
echo "**** cleanup ****" && \

‎Dockerfile.armhf

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎Jenkinsfile

Lines changed: 60 additions & 125 deletions
Large diffs are not rendered by default.

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The architectures supported by this image are:
5656
| :----: | :----: | ---- |
5757
| x86-64 | ✅ | amd64-\<version tag\> |
5858
| arm64 | ✅ | arm64v8-\<version tag\> |
59-
| armhf | ✅ | arm32v7-\<version tag\> |
59+
| armhf | ❌ | |
6060

6161
## Application Setup
6262

@@ -211,6 +211,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
211211

212212
## Versions
213213

214+
* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
214215
* **30.12.22:** - Rebase to alpine 3.17.
215216
* **19.09.22:** - Rebase to alpine 3.15.
216217
* **14.05.21:** - Add linuxserver wheel index.

‎jenkins-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ external_type: pip_version
66
release_type: stable
77
release_tag: latest
88
ls_branch: master
9+
build_armhf: false
910
repo_vars:
1011
- EXT_RELEASE_TYPE = 'pip_version'
1112
- EXT_PIP = 'python-ldap'

‎package_versions.txt

Lines changed: 71 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,71 @@
1-
NAME VERSION TYPE
2-
alpine-baselayout 3.4.0-r0 apk
3-
alpine-baselayout-data 3.4.0-r0 apk
4-
alpine-keys 2.4-r1 apk
5-
alpine-release 3.17.3-r0 apk
6-
apk-tools 2.12.10-r1 apk
7-
bash 5.2.15-r0 apk
8-
brotli-libs 1.0.9-r9 apk
9-
busybox 1.35.0 binary
10-
busybox 1.35.0-r29 apk
11-
busybox-binsh 1.35.0-r29 apk
12-
ca-certificates 20230506-r0 apk
13-
ca-certificates-bundle 20230506-r0 apk
14-
cffi 1.15.1 python
15-
coreutils 9.1-r0 apk
16-
cryptography 40.0.2 python
17-
curl 8.1.0-r1 apk
18-
gdbm 1.23-r0 apk
19-
jq 1.6-r2 apk
20-
libacl 2.3.1-r1 apk
21-
libattr 2.5.1-r2 apk
22-
libbsd 0.11.7-r0 apk
23-
libbz2 1.0.8-r4 apk
24-
libc-utils 0.7.2-r3 apk
25-
libcrypto3 3.0.8-r4 apk
26-
libcurl 8.1.0-r1 apk
27-
libexpat 2.5.0-r0 apk
28-
libffi 3.4.4-r0 apk
29-
libgcc 12.2.1_git20220924-r4 apk
30-
libintl 0.21.1-r1 apk
31-
libldap 2.6.3-r6 apk
32-
libmd 1.0.4-r0 apk
33-
libproc 3.3.17-r2 apk
34-
libsasl 2.1.28-r3 apk
35-
libssl3 3.0.8-r4 apk
36-
libstdc++ 12.2.1_git20220924-r4 apk
37-
linux-pam 1.5.2-r1 apk
38-
mpdecimal 2.5.1-r1 apk
39-
musl 1.2.3-r5 apk
40-
musl-utils 1.2.3-r5 apk
41-
ncurses-libs 6.3_p20221119-r0 apk
42-
ncurses-terminfo-base 6.3_p20221119-r0 apk
43-
netcat-openbsd 1.130-r4 apk
44-
nghttp2-libs 1.51.0-r0 apk
45-
oniguruma 6.9.8-r0 apk
46-
pip 23.1.2 python
47-
procps 3.3.17-r2 apk
48-
pyasn1 0.5.0 python
49-
pyasn1-modules 0.3.0 python
50-
pycparser 2.21 python
51-
python 3.10.11 binary
52-
python-ldap 3.4.3 python
53-
python3 3.10.11-r0 apk
54-
readline 8.2.0-r0 apk
55-
scanelf 1.3.5-r1 apk
56-
setuptools 65.5.0 python
57-
shadow 4.13-r0 apk
58-
skalibs 2.12.0.1-r0 apk
59-
sqlite-libs 3.40.1-r0 apk
60-
ssl_client 1.35.0-r29 apk
61-
tzdata 2023c-r0 apk
62-
utmps-libs 0.1.2.0-r1 apk
63-
wheel 0.40.0 python
64-
xz 5.2.9-r0 apk
65-
xz-libs 5.2.9-r0 apk
66-
zlib 1.2.13-r0 apk
1+
NAME VERSION TYPE
2+
alpine-baselayout 3.4.3-r1 apk
3+
alpine-baselayout-data 3.4.3-r1 apk
4+
alpine-keys 2.4-r1 apk
5+
alpine-release 3.18.2-r0 apk
6+
apk-tools 2.14.0-r2 apk
7+
bash 5.2.15-r5 apk
8+
brotli-libs 1.0.9-r14 apk
9+
busybox 1.36.1 binary
10+
busybox 1.36.1-r0 apk
11+
busybox-binsh 1.36.1-r0 apk
12+
ca-certificates 20230506-r0 apk
13+
ca-certificates-bundle 20230506-r0 apk
14+
cffi 1.15.1 python
15+
coreutils 9.3-r1 apk
16+
cryptography 41.0.1 python
17+
curl 8.1.2-r0 apk
18+
gdbm 1.23-r1 apk
19+
jq 1.6-r3 apk
20+
libacl 2.3.1-r3 apk
21+
libattr 2.5.1-r4 apk
22+
libbsd 0.11.7-r1 apk
23+
libbz2 1.0.8-r5 apk
24+
libc-utils 0.7.2-r5 apk
25+
libcrypto3 3.1.1-r1 apk
26+
libcurl 8.1.2-r0 apk
27+
libexpat 2.5.0-r1 apk
28+
libffi 3.4.4-r2 apk
29+
libgcc 12.2.1_git20220924-r10 apk
30+
libidn2 2.3.4-r1 apk
31+
libintl 0.21.1-r7 apk
32+
libldap 2.6.4-r3 apk
33+
libmd 1.0.4-r2 apk
34+
libncursesw 6.4_p20230506-r0 apk
35+
libpanelw 6.4_p20230506-r0 apk
36+
libproc2 4.0.3-r1 apk
37+
libsasl 2.1.28-r4 apk
38+
libssl3 3.1.1-r1 apk
39+
libstdc++ 12.2.1_git20220924-r10 apk
40+
libunistring 1.1-r1 apk
41+
linux-pam 1.5.2-r10 apk
42+
mpdecimal 2.5.1-r2 apk
43+
musl 1.2.4-r0 apk
44+
musl-utils 1.2.4-r0 apk
45+
ncurses-terminfo-base 6.4_p20230506-r0 apk
46+
netcat-openbsd 1.219-r1 apk
47+
nghttp2-libs 1.53.0-r0 apk
48+
oniguruma 6.9.8-r1 apk
49+
pip 23.1.2 python
50+
procps-ng 4.0.3-r1 apk
51+
pyasn1 0.5.0 python
52+
pyasn1-modules 0.3.0 python
53+
pyc 0.1-r0 apk
54+
pycparser 2.21 python
55+
python 3.11.4 binary
56+
python-ldap 3.4.3 python
57+
python3 3.11.4-r0 apk
58+
python3-pyc 3.11.4-r0 apk
59+
python3-pycache-pyc0 3.11.4-r0 apk
60+
readline 8.2.1-r1 apk
61+
scanelf 1.3.7-r1 apk
62+
setuptools 65.5.0 python
63+
shadow 4.13-r4 apk
64+
skalibs 2.13.1.1-r1 apk
65+
sqlite-libs 3.41.2-r2 apk
66+
ssl_client 1.36.1-r0 apk
67+
tzdata 2023c-r1 apk
68+
utmps-libs 0.1.2.1-r1 apk
69+
wheel 0.40.0 python
70+
xz-libs 5.4.3-r0 apk
71+
zlib 1.2.13-r1 apk

‎readme-vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
1111
available_architectures:
1212
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
1313
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
14-
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
1514

1615
# container parameters
1716
common_param_env_vars_enabled: false
@@ -43,7 +42,8 @@ app_setup_block: |
4342
4443
# changelog
4544
changelogs:
46-
- { date: "24.05.23:", desc: "Sync upstream changes, including the ability to disable referrals with `X-Ldap-DisableReferrals`." }
45+
- { date: "20.06.23:", desc: "Sync upstream changes, including the ability to disable referrals with `X-Ldap-DisableReferrals`." }
46+
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
4747
- { date: "30.12.22:", desc: "Rebase to alpine 3.17." }
4848
- { date: "19.09.22:", desc: "Rebase to alpine 3.15." }
4949
- { date: "14.05.21:", desc: "Add linuxserver wheel index." }

0 commit comments

Comments
 (0)