Skip to content

Commit 7d7b8c0

Browse files
committed
Restructure files
Use catatonit Remove CI server page
1 parent 263acc0 commit 7d7b8c0

69 files changed

Lines changed: 25 additions & 60 deletions

Some content is hidden

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

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"]
File renamed without changes.
File renamed without changes.

roles/generate-jenkins/tasks/main.yml renamed to ansible/roles/generate-jenkins/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
- name: include template loop variables
2828
include_vars:
29-
file: "/ansible/roles/generate-jenkins/templates.yml"
29+
file: "/app/roles/generate-jenkins/templates.yml"
3030

3131
############################
3232
# Directory Management #
File renamed without changes.
File renamed without changes.
File renamed without changes.

roles/generate-jenkins/templates/99-deprecation.j2 renamed to ansible/roles/generate-jenkins/templates/99-deprecation.j2

File renamed without changes.

0 commit comments

Comments
 (0)