From 4a3040dfd8b034b71fced6a2bb0e58a4ad0e077c Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 27 Aug 2024 17:11:56 +0300 Subject: [PATCH 1/5] COmanage v4.3.5 release --- .gitignore | 79 ++++++++++++++++++++++ Jenkinsfile | 2 +- comanage-registry-base/README.md | 2 +- comanage-registry-cron/README.md | 2 +- comanage-registry-internet2-tier/README.md | 4 +- common.bash | 2 +- docs/comanage-registry-internet2-tier.md | 2 +- docs/evaluation.md | 2 +- 8 files changed, 87 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cc26017 --- /dev/null +++ b/.gitignore @@ -0,0 +1,79 @@ +### JetBrains template +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + diff --git a/Jenkinsfile b/Jenkinsfile index ec2aa34..7906ba3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { maintainer_credential_ref = 'dockerhub-tier' imagename = 'g' tag = 'l' - version='4.3.4' + version='4.3.5' } stages { stage('Setting build context') { diff --git a/comanage-registry-base/README.md b/comanage-registry-base/README.md index 1527e7f..b8c7e61 100644 --- a/comanage-registry-base/README.md +++ b/comanage-registry-base/README.md @@ -53,7 +53,7 @@ docker build \ ## Building Example ``` -export COMANAGE_REGISTRY_VERSION=4.3.4 +export COMANAGE_REGISTRY_VERSION=4.3.5 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_BASE_IMAGE_VERSION}" docker build \ diff --git a/comanage-registry-cron/README.md b/comanage-registry-cron/README.md index c4fdd6a..7b8f980 100644 --- a/comanage-registry-cron/README.md +++ b/comanage-registry-cron/README.md @@ -52,7 +52,7 @@ docker build \ ## Building Example ``` -export COMANAGE_REGISTRY_VERSION=4.3.4 +export COMANAGE_REGISTRY_VERSION=4.3.5 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 export COMANAGE_REGISTRY_CRON_IMAGE_VERSION=1 TAG="${COMANAGE_REGISTRY_VERSION}-${COMANAGE_REGISTRY_CRON_IMAGE_VERSION}" diff --git a/comanage-registry-internet2-tier/README.md b/comanage-registry-internet2-tier/README.md index 74f6706..a0c1df8 100644 --- a/comanage-registry-internet2-tier/README.md +++ b/comanage-registry-internet2-tier/README.md @@ -58,7 +58,7 @@ docker build \ ## Building Example ``` -export COMANAGE_REGISTRY_VERSION=4.3.4 +export COMANAGE_REGISTRY_VERSION=4.3.5 export COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 export COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 export COMANAGE_REGISTRY_I2_IMAGE_VERSION=1 @@ -134,7 +134,7 @@ docker run -d \ -v /etc/shibboleth/my-org-metadata.xml:/etc/shibboleth/my-org-metadata.xml \ -p 80:80 \ -p 443:443 \ - comanage-registry:4.3.4-internet2-tier-1 + comanage-registry:4.3.5-internet2-tier-1 ``` ## Logging diff --git a/common.bash b/common.bash index 1faeaa2..4669250 100644 --- a/common.bash +++ b/common.bash @@ -1,3 +1,3 @@ maintainer="i2incommon" imagename="comanage-registry" -COMANAGE_REGISTRY_VERSION="4.3.4" +COMANAGE_REGISTRY_VERSION="4.3.5" diff --git a/docs/comanage-registry-internet2-tier.md b/docs/comanage-registry-internet2-tier.md index e031126..45e258e 100644 --- a/docs/comanage-registry-internet2-tier.md +++ b/docs/comanage-registry-internet2-tier.md @@ -50,7 +50,7 @@ wiki page for the list of releases. We recommend using the latest release. Here is an example (but please check the wiki page for the latest release number): ``` -export COMANAGE_REGISTRY_VERSION=4.3.4 +export COMANAGE_REGISTRY_VERSION=4.3.5 ``` * Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the diff --git a/docs/evaluation.md b/docs/evaluation.md index 65c8f75..d990305 100644 --- a/docs/evaluation.md +++ b/docs/evaluation.md @@ -44,7 +44,7 @@ wiki page for the list of releases. We recommend using the latest release. Here is an example (but please check the wiki page for the latest release number): ``` -export COMANAGE_REGISTRY_VERSION=4.3.4 +export COMANAGE_REGISTRY_VERSION=4.3.5 ``` * Build the base COmanage Registry image: From 8930717b7629ec927d83866874926ea29a4a6b45 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 27 Aug 2024 17:37:52 +0300 Subject: [PATCH 2/5] fix centos mirrorlist issue --- comanage-registry-internet2-tier-base/Dockerfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile index affa9d2..a787f21 100644 --- a/comanage-registry-internet2-tier-base/Dockerfile +++ b/comanage-registry-internet2-tier-base/Dockerfile @@ -23,7 +23,15 @@ USER root RUN yum -y remove \ postgresql-libs \ postgresql-devel \ - postgresql + postgresql \ + +# Centos 7 has reached EOL (End of Life) today, 1 July 2024, +# thus mirrorlist.centos.org is no longer required. +# In order to install packages, +# you have to adjust repositories from "mirrorlist" to "baseurl" +RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \ + sed -i s/^#.*baseurl=http/baseurl=https/g /etc/yum.repos.d/*.repo \ + sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo \ ARG PHP_VERSION=8.1.29 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz From 0f65f5ad6e9e2e5ef6bb9c3d5de3814e84dd6621 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 27 Aug 2024 17:43:52 +0300 Subject: [PATCH 3/5] type error --- comanage-registry-internet2-tier-base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile index a787f21..12d8237 100644 --- a/comanage-registry-internet2-tier-base/Dockerfile +++ b/comanage-registry-internet2-tier-base/Dockerfile @@ -23,7 +23,7 @@ USER root RUN yum -y remove \ postgresql-libs \ postgresql-devel \ - postgresql \ + postgresql # Centos 7 has reached EOL (End of Life) today, 1 July 2024, # thus mirrorlist.centos.org is no longer required. @@ -31,7 +31,7 @@ RUN yum -y remove \ # you have to adjust repositories from "mirrorlist" to "baseurl" RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \ sed -i s/^#.*baseurl=http/baseurl=https/g /etc/yum.repos.d/*.repo \ - sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo \ + sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo ARG PHP_VERSION=8.1.29 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz From 9586872d9bdf6a4146d8bd9e008d2d700b6086ac Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 27 Aug 2024 17:49:59 +0300 Subject: [PATCH 4/5] move sed commands to a shell file --- comanage-registry-internet2-tier-base/Dockerfile | 7 ++++--- comanage-registry-internet2-tier-base/mirrorcentos.sh | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 comanage-registry-internet2-tier-base/mirrorcentos.sh diff --git a/comanage-registry-internet2-tier-base/Dockerfile b/comanage-registry-internet2-tier-base/Dockerfile index 12d8237..9729a66 100644 --- a/comanage-registry-internet2-tier-base/Dockerfile +++ b/comanage-registry-internet2-tier-base/Dockerfile @@ -29,9 +29,10 @@ RUN yum -y remove \ # thus mirrorlist.centos.org is no longer required. # In order to install packages, # you have to adjust repositories from "mirrorlist" to "baseurl" -RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo \ - sed -i s/^#.*baseurl=http/baseurl=https/g /etc/yum.repos.d/*.repo \ - sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo +# Rebuild shibboleth +COPY mirrorcentos.sh /opt/mirrorcentos.sh +RUN chmod +x /opt/mirrorcentos.sh +RUN ["/bin/bash", "-c", "/opt/mirrorcentos.sh"] ARG PHP_VERSION=8.1.29 ARG PHP_SRC_URL=https://github.com/php/php-src/archive/php-${PHP_VERSION}.tar.gz diff --git a/comanage-registry-internet2-tier-base/mirrorcentos.sh b/comanage-registry-internet2-tier-base/mirrorcentos.sh new file mode 100644 index 0000000..c7cd219 --- /dev/null +++ b/comanage-registry-internet2-tier-base/mirrorcentos.sh @@ -0,0 +1,3 @@ +sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo +sed -i s/^#.*baseurl=http/baseurl=https/g /etc/yum.repos.d/*.repo +sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo \ No newline at end of file From e7659d14764d70e2d499b8e7d94b34a0496a6421 Mon Sep 17 00:00:00 2001 From: Ioannis Igoumenos Date: Tue, 27 Aug 2024 18:11:30 +0300 Subject: [PATCH 5/5] mirrorcentos script fro comanage-registry-internet2-tier --- comanage-registry-internet2-tier/Dockerfile | 4 ++++ comanage-registry-internet2-tier/mirrorcentos.sh | 3 +++ 2 files changed, 7 insertions(+) create mode 100644 comanage-registry-internet2-tier/mirrorcentos.sh diff --git a/comanage-registry-internet2-tier/Dockerfile b/comanage-registry-internet2-tier/Dockerfile index f67ea3c..cf80cec 100644 --- a/comanage-registry-internet2-tier/Dockerfile +++ b/comanage-registry-internet2-tier/Dockerfile @@ -28,6 +28,10 @@ FROM centos/python-38-centos7 USER root +COPY mirrorcentos.sh /opt/mirrorcentos.sh +RUN chmod +x /opt/mirrorcentos.sh +RUN ["/bin/bash", "-c", "/opt/mirrorcentos.sh"] + ARG COMANAGE_REGISTRY_VERSION ENV COMANAGE_REGISTRY_VERSION ${COMANAGE_REGISTRY_VERSION} LABEL comanage_registry_version=${COMANAGE_REGISTRY_VERSION} diff --git a/comanage-registry-internet2-tier/mirrorcentos.sh b/comanage-registry-internet2-tier/mirrorcentos.sh new file mode 100644 index 0000000..c7cd219 --- /dev/null +++ b/comanage-registry-internet2-tier/mirrorcentos.sh @@ -0,0 +1,3 @@ +sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo +sed -i s/^#.*baseurl=http/baseurl=https/g /etc/yum.repos.d/*.repo +sed -i s/^mirrorlist=http/#mirrorlist=https/g /etc/yum.repos.d/*.repo \ No newline at end of file