From c0e4f3ce7520022b28588f51e890115308080b27 Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Wed, 7 Jul 2021 12:43:43 -0700 Subject: [PATCH] Linux SDK docker: add Rocky Linux support --- .../docker/natron-sdk-rockylinux8/.gitignore | 29 +++++++++++++++++++ tools/docker/natron-sdk-rockylinux8/build.sh | 15 ++++++++++ .../include/scripts/build-Linux-sdk.sh | 3 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 tools/docker/natron-sdk-rockylinux8/.gitignore create mode 100755 tools/docker/natron-sdk-rockylinux8/build.sh diff --git a/tools/docker/natron-sdk-rockylinux8/.gitignore b/tools/docker/natron-sdk-rockylinux8/.gitignore new file mode 100644 index 0000000000..99740fce89 --- /dev/null +++ b/tools/docker/natron-sdk-rockylinux8/.gitignore @@ -0,0 +1,29 @@ +Dockerfile +build-Linux-installer.sh +build-Linux-sdk.sh +build-OSX-installer.sh +build-Windows-installer.sh +build-natron.sh +build-plugins.sh +checkout-repository.sh +common.sh +compiler-common.sh +createBuildOptionsFile.sh +ensure-ssh-identity.sh +gen-natron-doc.sh +genDllVersions.sh +gitRepositories.sh +launchBuildMain.sh +linuxStartupJenkins.sh +macStartupJenkins.sh +manageBuildOptions.sh +manageLog.sh +msysStartupJenkins.sh +push.sh +runUnitTests.sh +uploadArtifactsMain.sh +zip-python.sh +include +pkg +builds +artifacts diff --git a/tools/docker/natron-sdk-rockylinux8/build.sh b/tools/docker/natron-sdk-rockylinux8/build.sh new file mode 100755 index 0000000000..326207fc1b --- /dev/null +++ b/tools/docker/natron-sdk-rockylinux8/build.sh @@ -0,0 +1,15 @@ +#!/bin/sh +cd `dirname "$0"` +cp ../../jenkins/*.sh . +(cd ../../jenkins/; tar cf - include) | tar xf - +export ROCKY=8 +LABEL="natrongithub/natron-sdk${UBUNTU+-ubuntu}${UBUNTU:-}${CENTOS+-centos}${CENTOS:-}${ROCKY+-rockylinux}${ROCKY:-}${DTS+-dts}${DTS:-}" +env GEN_DOCKERFILE=1 ../../jenkins/include/scripts/build-Linux-sdk.sh > Dockerfile +docker build -t "${LABEL}:latest" . +#docker build --no-cache -t "${LABEL}:latest" . +echo "please execute:" +#echo "docker-squash ${LABEL}:latest" +echo "docker login" +echo "docker tag ${LABEL}:latest ${LABEL}:$(date -u +%Y%m%d)" +echo "docker push ${LABEL}:latest" +echo "docker push ${LABEL}:$(date -u +%Y%m%d)" diff --git a/tools/jenkins/include/scripts/build-Linux-sdk.sh b/tools/jenkins/include/scripts/build-Linux-sdk.sh index fdb3ce9349..451f92bae0 100755 --- a/tools/jenkins/include/scripts/build-Linux-sdk.sh +++ b/tools/jenkins/include/scripts/build-Linux-sdk.sh @@ -175,8 +175,9 @@ EOF fi if [ "${CENTOS:-7}" -ge 8 ] || [ -n "${ROCKY+x}" ]; then # Enable powertools on CentOS >= 8 / Rocky Linux 8 + # https://www.how2shout.com/linux/how-to-enable-powertools-repository-on-rocky-linux-8/ # https://computingforgeeks.com/enable-powertools-repository-on-centos-rhel-linux/ - DTSYUM+="dnf -y install dnf-plugins-core && dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && dnf config-manager --set-enabled PowerTools && dnf -y groupinstall 'Development Tools' && " + DTSYUM+="dnf -y install dnf-plugins-core && dnf -y install epel-release && dnf config-manager --set-enabled powertools && dnf -y update && dnf -y groupinstall 'Development Tools' && " YUM_DEVEL_EXTRA="" else YUM_DEVEL_EXTRA="libXevie-devel libdmx-devel" # only available on CentOS <= 7