Skip to content

4.4.0 rc2 #7

Merged
merged 3 commits into from
Oct 23, 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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
maintainer_credential_ref = 'dockerhub-tier'
imagename = 'g'
tag = 'l'
version='4.3.5'
version='4.4.0-rc2'
}
stages {
stage('Setting build context') {
Expand Down Expand Up @@ -45,7 +45,7 @@ pipeline {
image_dir = 'comanage-registry-internet2-tier-base'
build_arg = '--no-cache ' +
"-f ./$image_dir/Dockerfile ./$image_dir"
def tap_base_image = docker.build("$image_to_build", "$build_arg")
// def tap_base_image = docker.build("$image_to_build", "$build_arg")

image_to_build = "$maintainer/$imagename"
image_dir = 'comanage-registry-internet2-tier'
Expand All @@ -54,8 +54,8 @@ pipeline {
"--build-arg COMANAGE_REGISTRY_BASE_IMAGE_VERSION=1 " +
"--build-arg COMANAGE_REGISTRY_I2_BASE_IMAGE_VERSION=1 " +
"-f ./$image_dir/Dockerfile ./$image_dir"
def tap_image = docker.build("$image_to_build", "$build_arg")
tap_image.push("$tag")
// def tap_image = docker.build("$image_to_build", "$build_arg")
// tap_image.push("$tag")

image_to_build = "$maintainer/$imagename-cron"
image_dir = 'comanage-registry-cron'
Expand Down
4 changes: 2 additions & 2 deletions comanage-registry-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM php:8.1.29-apache-bullseye
FROM php:8.2.24-apache-bookworm

# Official PHP image with Apache HTTPD includes
# --with-openssl
Expand All @@ -26,7 +26,7 @@ FROM php:8.1.29-apache-bullseye
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get install -y \
libldap-2.4-2 \
libldap-2.5-0 \
libldap2-dev \
libmariadb-dev \
libpq-dev \
Expand Down
2 changes: 1 addition & 1 deletion comanage-registry-base/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ docker build \
## Building Example

```
export COMANAGE_REGISTRY_VERSION=4.3.5
export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
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
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ docker build \
## Building Example

```
export COMANAGE_REGISTRY_VERSION=4.3.5
export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
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
4 changes: 2 additions & 2 deletions comanage-registry-internet2-tier/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ docker build \
## Building Example

```
export COMANAGE_REGISTRY_VERSION=4.3.5
export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
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.5-internet2-tier-1
comanage-registry:4.4.0-rc2-internet2-tier-1
```

## Logging
Expand Down
2 changes: 1 addition & 1 deletion common.bash
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
maintainer="i2incommon"
imagename="comanage-registry"
COMANAGE_REGISTRY_VERSION="4.3.5"
COMANAGE_REGISTRY_VERSION="4.4.0-rc2"
2 changes: 1 addition & 1 deletion docs/comanage-registry-internet2-tier.md
Original file line number Diff line number Diff line change
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.5
export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
```

* Define the shell variable `COMANAGE_REGISTRY_BASE_IMAGE_VERSION` to be the
Expand Down
2 changes: 1 addition & 1 deletion docs/evaluation.md
Original file line number Diff line number Diff line change
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.5
export COMANAGE_REGISTRY_VERSION=4.4.0-rc2
```

* Build the base COmanage Registry image:
Expand Down