From 86fec79c4eeb9ae974f244a4aecda118c38059c3 Mon Sep 17 00:00:00 2001 From: git Date: Tue, 17 Oct 2023 13:26:59 +0000 Subject: [PATCH] 'update files with ansible' --- Dockerfile | 24 ++++++++++++------------ Jenkinsfile | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index e68baf1..ab3952a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.15.4 +# Base on latest UBI image +FROM harbor.ervine.dev/public/x86_64/ubi9:9.2-722 LABEL maintainer="Jonathan Ervine docker@ervine.org" @@ -8,16 +8,16 @@ ENV LANG='en_US.UTF-8' \ LANGUAGE='en_US.UTF-8' \ TERM='xterm' -RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \ - apk -U update && \ - apk -U upgrade --ignore alpine-baselayout && \ - apk -U add icu libintl libmediainfo ca-certificates mono curl && \ - apk del make gcc g++ && \ - rm -rf /tmp/src && \ - rm -rf /var/cache/apk/* && \ - curl -SL https://github.com/Radarr/Radarr/releases/download/v4.3.2.6857/Radarr.master.4.3.2.6857.linux-musl-core-x64.tar.gz | tar zxv && \ - addgroup -g 1027 radarr && \ - adduser -D -u 1027 -G radarr -H radarr && \ +RUN dnf update -y && \ + dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \ + dnf install -y epel-release epel-next-release && \ + dnf install -y libmediainfo ca-certificates mono-core zip curl libgdiplus --allowerasing && \ + update-ca-trust && \ + dnf clean all && \ + + curl -SL https://github.com/Radarr/Radarr/releases/download/v5.0.3.8127/Radarr.master.5.0.3.8127.linux-core-x64.tar.gz | tar zxv && \ + groupadd -g 1027 radarr && \ + useradd -u 1027 -g radarr -M radarr && \ chown -R radarr:radarr /Radarr EXPOSE 7878 diff --git a/Jenkinsfile b/Jenkinsfile index 05fd263..b7d8702 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,13 +25,13 @@ spec: node(POD_LABEL) { stage('Build with Kaniko') { - git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-radarr.git', credentialsId: 'jenkins-to-git' + git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-radarr', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/radarr:v4.3.2.6857 --destination=harbor.ervine.dev/public/x86_64/alpine/radarr:v3.0' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/ubi/radarr:v5.0.3.8127 --destination=harbor.ervine.dev/public/x86_64/ubi/radarr:v5.0.3.8127' } } stage('Notify gchat') { - hangoutsNotify message: "Radarr Movie Manager 4.3.2.6857 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false - } + googlechatnotification (url: 'https://chat.googleapis.com/v1/spaces/AAAA-nNKzdA/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=FySO2Zy2wfNJ7QKoqT9zy0uzNJF8bwj74ansor3BTu0%3D', message: "Radarr 5.0.3.8127 on RHEL UBI has built") + } } }