Skip to content

Commit 64779e2

Browse files
authored
Merge pull request #329 from linuxserver/monthly
Rewrite logic
2 parents c8c92af + 32e98d8 commit 64779e2

86 files changed

Lines changed: 351 additions & 409 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/FUNDING.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.bug.yml

100755100644
File mode changed.

.github/ISSUE_TEMPLATE/issue.feature.yml

100755100644
File mode changed.

.github/workflows/call_issue_pr_tracker.yml

100755100644
File mode changed.

.github/workflows/call_issues_cron.yml

100755100644
File mode changed.

.github/workflows/greetings.yml

100755100644
File mode changed.

.github/workflows/permissions.yml

100755100644
File mode changed.

Dockerfile

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

3-
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:3.21
44

55
# set version label
66
ARG BUILD_DATE
77
ARG VERSION
88
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
9-
LABEL maintainer="homer, thelamer"
9+
LABEL maintainer="roxedus, thelamer"
1010

1111
RUN \
1212
echo "**** install build packages ****" && \
13-
VERSION=v4.34.1 &&\
14-
wget https://github.com/mikefarah/yq/releases/download/${VERSION}/yq_linux_amd64 -O /usr/bin/yq &&\
13+
YQ_VERSION=v4.45.1 &&\
14+
wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64 -O /usr/bin/yq &&\
1515
chmod +x /usr/bin/yq && \
1616
apk add --no-cache --upgrade \
1717
ansible && \
18+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}\n" > /build_version && \
1819
apk del \
1920
alpine-release
2021

21-
COPY . /ansible
22+
COPY /ansible /app
23+
COPY entrypoint.sh entrypoint.sh
2224

23-
ENTRYPOINT [ "/ansible/entrypoint.sh" ]
25+
WORKDIR /app
26+
27+
ENTRYPOINT ["catatonit", "--", "/entrypoint.sh"]

Dockerfile.aarch64

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

3-
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
3+
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
44

55
# set version label
66
ARG BUILD_DATE
77
ARG VERSION
88
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
9-
LABEL maintainer="homer, thelamer"
9+
LABEL maintainer="roxedus, thelamer"
1010

1111
RUN \
1212
echo "**** install build packages ****" && \
13-
VERSION=v4.34.1 &&\
14-
wget https://github.com/mikefarah/yq/releases/download/${VERSION}/yq_linux_arm64 -O /usr/bin/yq &&\
13+
YQ_VERSION=v4.45.1 &&\
14+
wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_arm64 -O /usr/bin/yq &&\
1515
chmod +x /usr/bin/yq && \
1616
apk add --no-cache --upgrade \
1717
ansible && \
18+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}\n" > /build_version && \
1819
apk del \
1920
alpine-release
2021

21-
COPY . /ansible
22+
COPY /ansible /app
23+
COPY entrypoint.sh entrypoint.sh
2224

23-
ENTRYPOINT [ "/ansible/entrypoint.sh" ]
25+
WORKDIR /app
26+
27+
ENTRYPOINT ["catatonit", "--", "/entrypoint.sh"]

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pipeline {
2929
DIST_IMAGE='alpine'
3030
MULTIARCH='true'
3131
CI='true'
32-
CI_WEB='true'
32+
CI_WEB='false'
3333
CI_PORT='8000'
3434
CI_SSL='false'
3535
CI_DELAY='60'

0 commit comments

Comments
 (0)