Skip to content

Bump version to v4.3.5 #6

Merged
merged 5 commits into from Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
79 changes: 79 additions & 0 deletions .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

2 changes: 1 addition & 1 deletion Jenkinsfile
Expand Up @@ -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') {
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-base/README.md
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-cron/README.md
Expand Up @@ -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}"
Expand Down
9 changes: 9 additions & 0 deletions comanage-registry-internet2-tier-base/Dockerfile
Expand Up @@ -25,6 +25,15 @@ RUN yum -y remove \
postgresql-devel \
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"
# 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

Expand Down
3 changes: 3 additions & 0 deletions 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
4 changes: 4 additions & 0 deletions comanage-registry-internet2-tier/Dockerfile
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions comanage-registry-internet2-tier/README.md
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions 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
2 changes: 1 addition & 1 deletion common.bash
@@ -1,3 +1,3 @@
maintainer="i2incommon"
imagename="comanage-registry"
COMANAGE_REGISTRY_VERSION="4.3.4"
COMANAGE_REGISTRY_VERSION="4.3.5"
2 changes: 1 addition & 1 deletion docs/comanage-registry-internet2-tier.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/evaluation.md
Expand Up @@ -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:
Expand Down