Skip to content

Commit 11133b5

Browse files
drizuiddrizuid
authored
Merge pull request #26 from linuxserver/3.12
rebase to 3.12, serve login page at /ldaplogin
2 parents 989a776 + 529b5ad commit 11133b5

File tree

10 files changed

+88
-90
lines changed

10 files changed

+88
-90
lines changed

‎Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:3.11
1+
FROM lsiobase/alpine:3.12
22

33
# set version label
44
ARG BUILD_DATE
@@ -18,23 +18,24 @@ RUN \
1818
apk add --no-cache \
1919
libffi \
2020
libldap \
21+
py3-pip \
2122
python3 && \
2223
if [ -z ${LDAP_VERSION+x} ]; then \
2324
LDAP_INSTALL="python-ldap"; \
2425
else \
2526
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
2627
fi && \
2728
pip3 install -U --no-cache-dir \
28-
pip && \
29+
pip && \
2930
pip install -U \
30-
cryptography \
31-
${LDAP_INSTALL} && \
31+
cryptography \
32+
${LDAP_INSTALL} && \
3233
echo "**** cleanup ****" && \
3334
apk del --purge \
34-
build-dependencies && \
35+
build-dependencies && \
3536
rm -rf \
36-
/tmp/* \
37-
/root/.cache/pip
37+
/tmp/* \
38+
/root/.cache/pip
3839

3940
# copy local files
4041
COPY root/ /

‎Dockerfile.aarch64

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm64v8-3.11
1+
FROM lsiobase/alpine:arm64v8-3.12
22

33
# set version label
44
ARG BUILD_DATE
@@ -18,23 +18,24 @@ RUN \
1818
apk add --no-cache \
1919
libffi \
2020
libldap \
21+
py3-pip \
2122
python3 && \
2223
if [ -z ${LDAP_VERSION+x} ]; then \
2324
LDAP_INSTALL="python-ldap"; \
2425
else \
2526
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
2627
fi && \
2728
pip3 install -U --no-cache-dir \
28-
pip && \
29+
pip && \
2930
pip install -U \
30-
cryptography \
31-
${LDAP_INSTALL} && \
31+
cryptography \
32+
${LDAP_INSTALL} && \
3233
echo "**** cleanup ****" && \
3334
apk del --purge \
34-
build-dependencies && \
35+
build-dependencies && \
3536
rm -rf \
36-
/tmp/* \
37-
/root/.cache/pip
37+
/tmp/* \
38+
/root/.cache/pip
3839

3940
# copy local files
4041
COPY root/ /

‎Dockerfile.armhf

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM lsiobase/alpine:arm32v7-3.11
1+
FROM lsiobase/alpine:arm32v7-3.12
22

33
# set version label
44
ARG BUILD_DATE
@@ -18,23 +18,24 @@ RUN \
1818
apk add --no-cache \
1919
libffi \
2020
libldap \
21+
py3-pip \
2122
python3 && \
2223
if [ -z ${LDAP_VERSION+x} ]; then \
2324
LDAP_INSTALL="python-ldap"; \
2425
else \
2526
LDAP_INSTALL="python-ldap==${LDAP_VERSION}"; \
2627
fi && \
2728
pip3 install -U --no-cache-dir \
28-
pip && \
29+
pip && \
2930
pip install -U \
30-
cryptography \
31-
${LDAP_INSTALL} && \
31+
cryptography \
32+
${LDAP_INSTALL} && \
3233
echo "**** cleanup ****" && \
3334
apk del --purge \
34-
build-dependencies && \
35+
build-dependencies && \
3536
rm -rf \
36-
/tmp/* \
37-
/root/.cache/pip
37+
/tmp/* \
38+
/root/.cache/pip
3839

3940
# copy local files
4041
COPY root/ /

‎Jenkinsfile

Lines changed: 23 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ pipeline {
2828
DIST_IMAGE = 'alpine'
2929
MULTIARCH='true'
3030
CI='true'
31-
CI_WEB='false'
32-
CI_PORT=''
33-
CI_SSL=''
34-
CI_DELAY='30'
31+
CI_WEB='true'
32+
CI_PORT='9000'
33+
CI_SSL='false'
34+
CI_DELAY='60'
3535
CI_DOCKERENV='TZ=US/Pacific'
36-
CI_AUTH=''
37-
CI_WEBPATH=''
36+
CI_AUTH='user:password'
37+
CI_WEBPATH='/test'
3838
}
3939
stages {
4040
// Setup all the basic environment variables needed for the build
@@ -129,7 +129,6 @@ pipeline {
129129
steps {
130130
script{
131131
env.IMAGE = env.DOCKERHUB_IMAGE
132-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
133132
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
134133
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
135134
if (env.MULTIARCH == 'true') {
@@ -150,7 +149,6 @@ pipeline {
150149
steps {
151150
script{
152151
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
153-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
154152
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
155153
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
156154
if (env.MULTIARCH == 'true') {
@@ -171,7 +169,6 @@ pipeline {
171169
steps {
172170
script{
173171
env.IMAGE = env.PR_DOCKERHUB_IMAGE
174-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
175172
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
176173
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
177174
if (env.MULTIARCH == 'true') {
@@ -536,22 +533,15 @@ pipeline {
536533
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
537534
usernameVariable: 'DOCKERUSER',
538535
passwordVariable: 'DOCKERPASS'
539-
],
540-
[
541-
$class: 'UsernamePasswordMultiBinding',
542-
credentialsId: 'Quay.io-Robot',
543-
usernameVariable: 'QUAYUSER',
544-
passwordVariable: 'QUAYPASS'
545536
]
546537
]) {
547538
retry(5) {
548539
sh '''#! /bin/bash
549540
set -e
550-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
551541
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
552542
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
553543
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
554-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
544+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
555545
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
556546
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
557547
docker push ${PUSHIMAGE}:latest
@@ -560,7 +550,7 @@ pipeline {
560550
'''
561551
}
562552
sh '''#! /bin/bash
563-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
553+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
564554
docker rmi \
565555
${DELETEIMAGE}:${META_TAG} \
566556
${DELETEIMAGE}:latest || :
@@ -582,18 +572,11 @@ pipeline {
582572
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
583573
usernameVariable: 'DOCKERUSER',
584574
passwordVariable: 'DOCKERPASS'
585-
],
586-
[
587-
$class: 'UsernamePasswordMultiBinding',
588-
credentialsId: 'Quay.io-Robot',
589-
usernameVariable: 'QUAYUSER',
590-
passwordVariable: 'QUAYPASS'
591575
]
592576
]) {
593577
retry(5) {
594578
sh '''#! /bin/bash
595579
set -e
596-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
597580
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
598581
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
599582
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -627,26 +610,24 @@ pipeline {
627610
docker manifest push --purge ${MANIFESTIMAGE}:latest
628611
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
629612
done
630-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
631-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
632-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
633-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
634-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
635-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
636-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
637-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
638-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
639-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
640-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
641-
docker push ${LEGACYIMAGE}:latest
642-
docker push ${LEGACYIMAGE}:${META_TAG}
643-
docker push ${LEGACYIMAGE}:arm32v7-latest
644-
docker push ${LEGACYIMAGE}:arm64v8-latest
645-
done
613+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
614+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
615+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
616+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
617+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
618+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
619+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
620+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
621+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
622+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
623+
docker push ${GITHUBIMAGE}:latest
624+
docker push ${GITHUBIMAGE}:${META_TAG}
625+
docker push ${GITHUBIMAGE}:arm32v7-latest
626+
docker push ${GITHUBIMAGE}:arm64v8-latest
646627
'''
647628
}
648629
sh '''#! /bin/bash
649-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
630+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
650631
docker rmi \
651632
${DELETEIMAGE}:amd64-${META_TAG} \
652633
${DELETEIMAGE}:amd64-latest \

0 commit comments

Comments
 (0)