From 2f806a4f109cfa04577a5d5315b346e3d7cc212d Mon Sep 17 00:00:00 2001 From: git Date: Fri, 13 Oct 2023 14:50:35 +0000 Subject: [PATCH] 'update files with ansible' --- Dockerfile | 12 ++++++------ Jenkinsfile | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index d038f62..12cfb45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# Base on latest (edge) alpine image -FROM harbor.ervine.dev/public/x86_64/alpine:v3.16.2 +# Base on latest UBI image +FROM harbor.ervine.dev/public/x86_64/ubi9:9.2-722 LABEL maintainer="Jonathan Ervine docker@ervine.org" @@ -10,10 +10,10 @@ ENV LANG='en_US.UTF-8' \ VERSION='3' \ MONO_TLS_PROVIDER=legacy -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 libmediainfo ca-certificates mono zip curl libgdiplus && \ +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 && \ apk del make gcc g++ && \ cert-sync /etc/ssl/certs/ca-certificates.crt && \ rm -rf /tmp/src && \ diff --git a/Jenkinsfile b/Jenkinsfile index 95441de..a2295b9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,13 +26,13 @@ spec: node(POD_LABEL) { stage('Build with Kaniko') { - git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.git', credentialsId: 'jenkins2git' + git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr', credentialsId: 'jenkins2git' container('kaniko') { - sh '/kaniko/executor --force -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:v3.0.9.1549' + sh '/kaniko/executor --force -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/ubi/sonarr:v3.0.9.1549' } } stage('Notify gchat') { - hangoutsNotify message: "Sonarr 3.0.9.1549 on Alpine has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Sonarr 3.0.9.1549 on Alpine has built",token: "https://chat.googleapis.com/v1/spaces/AAAA-nNKzdA/messages?key=AIzaSyDdI0hCZtE6vySjMm-WEfRq3CPzqKqqsHI&token=FySO2Zy2wfNJ7QKoqT9zy0uzNJF8bwj74ansor3BTu0%3D",threadByJob: false } } }