Skip to content

HYRAX-1964: Update docker images to use bes image as base instead of installing rpms #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hannahilea wants to merge 29 commits into
base: master
Choose a base branch
from
Draft

HYRAX-1964: Update docker images to use bes image as base instead of installing rpms #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
462d72f
fix readme :)
hannahilea Dec 18, 2025
9970c2e
remove stage that is not present in travis
hannahilea Dec 18, 2025
d8bf741
lightweight hyrax build with new bes image base
hannahilea Dec 19, 2025
6616a69
update bes image for debugging
hannahilea Dec 19, 2025
0370537
actually export vars
hannahilea Dec 19, 2025
03f622e
update version to include image
hannahilea Dec 19, 2025
65d0561
fail script if any one step fails
hannahilea Dec 19, 2025
8a4bba8
Merge branch 'master' into hr/HYRAX-1964-dockerize-bes
hannahilea Dec 19, 2025
377f005
update to match bes version
hannahilea Dec 19, 2025
249181f
fail fast
hannahilea Dec 22, 2025
ce966ae
add additional installation steps from rpm
hannahilea Dec 22, 2025
bce47cf
fail faster
hannahilea Dec 22, 2025
c702ac1
fail even faster
hannahilea Dec 22, 2025
ac29a05
more fail
hannahilea Dec 22, 2025
dee8669
Merge branch 'master' into hr/HYRAX-1964-dockerize-bes
hannahilea Dec 23, 2025
3bfd763
fail fast - again
hannahilea Dec 23, 2025
0088d05
Merge branch 'master' into hr/HYRAX-1964-dockerize-bes
Dec 30, 2025
d395003
wip copy rpm install behavior, permissions not yet correct
hannahilea Jan 2, 2026
49fc3a2
comment stuff out
hannahilea Jan 26, 2026
4b876fa
Merge branch 'master' into hr/HYRAX-1964-dockerize-bes
hannahilea Jan 26, 2026
7383535
wip build from new rhel-bes image
hannahilea Jan 27, 2026
6bd1984
Get besctl running
hannahilea Jan 28, 2026
295db23
update conf replacement
hannahilea Jan 28, 2026
87b3cb4
use installed java version
hannahilea Jan 29, 2026
ba424d4
clean up
hannahilea Feb 2, 2026
ed8984b
Merge branch 'master' into hr/HYRAX-1964-dockerize-bes
hannahilea Feb 2, 2026
acd3b9f
fix
hannahilea Feb 2, 2026
1a64acc
undo non-hyrax change
hannahilea Feb 2, 2026
63c7ad5
post-merge fix
hannahilea Feb 2, 2026
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
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,13 @@ logs
*.iml
*.log
/.project

# Intermediate build artifacts
*.tgz
*.rpm
*.gz
*tar.gz.asc
apache_tomcat_keys
travis/bes.json
travis/beslog2json.py
travis/cookies
283 changes: 140 additions & 143 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ install:
- ls -l ./builds

stages:
- name: OLFS
if: branch = master
Copy link
Contributor Author

@hannahilea hannahilea Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove cruft stage that no longer exists elsewhere.

- name: BUILD_AND_TEST
if: branch = master
- name: BUILD
Expand All @@ -115,24 +113,23 @@ jobs:
- export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot$TEST_DEPLOYMENT"
- export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${HYRAX_VERSION}$TEST_DEPLOYMENT"
- export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
# TODO: use versioned image! For testing, use the snapshot.
- export BES_IMAGE_TAG="opendap/bes_rhel8:snapshot"
# - export BES_IMAGE_TAG="opendap/bes_rhel8:${BES_VERSION}"
- show_version
- get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
- s3_get_besd_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"el8"
"${LIBDAP_VERSION}"
"${BES_VERSION}" $ADD_DEBUG 2>&1
- s3_get_olfs_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"${OLFS_VERSION}" 2>&1
# - get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
# - s3_get_olfs_distro
# "${S3_BUILD_BUCKET}"
# "${DOCKER_NAME}"
# "${OLFS_VERSION}" 2>&1
- set -e # Don't keep going if the docker build fails....
- docker build
--build-arg TOMCAT_VERSION
--build-arg RELEASE_DATE
--build-arg HYRAX_VERSION
--build-arg LIBDAP_VERSION
--build-arg BES_VERSION
--build-arg BES_IMAGE_TAG
--build-arg OLFS_VERSION
--tag "${SNAPSHOT_IMAGE_TAG}"
--tag "${BUILD_VERSION_TAG}"
Expand All @@ -142,139 +139,139 @@ jobs:
- echo "Running Test Script"
- ./travis/regression_test_script -i ${SNAPSHOT_IMAGE_TAG}

- stage: BUILD
name: "Build opendap/besd:snapshot (RH8)"
script:
- cd "${TARGET_OS}-builds"
- export DOCKER_NAME="besd"
- source ./build-rh8
- export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot$TEST_DEPLOYMENT"
- export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${BES_VERSION}$TEST_DEPLOYMENT"
- show_version
- s3_get_besd_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"el8"
"${LIBDAP_VERSION}"
"${BES_VERSION}" "${ADD_DEBUG_RPMS}" 2>&1
- docker build
--build-arg RELEASE_DATE
--build-arg HYRAX_VERSION
--build-arg LIBDAP_VERSION
--build-arg BES_VERSION
--tag "${SNAPSHOT_IMAGE_TAG}"
--tag "${BUILD_VERSION_TAG}"
"${DOCKER_NAME}"
- docker image ls -a
# - stage: BUILD
# name: "Build opendap/besd:snapshot (RH8)"
# script:
# - cd "${TARGET_OS}-builds"
# - export DOCKER_NAME="besd"
# - source ./build-rh8
# - export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot$TEST_DEPLOYMENT"
# - export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${BES_VERSION}$TEST_DEPLOYMENT"
# - show_version
# - s3_get_besd_distro
# "${S3_BUILD_BUCKET}"
# "${DOCKER_NAME}"
# "el8"
# "${LIBDAP_VERSION}"
# "${BES_VERSION}" "${ADD_DEBUG_RPMS}" 2>&1
# - docker build
# --build-arg RELEASE_DATE
# --build-arg HYRAX_VERSION
# --build-arg LIBDAP_VERSION
# --build-arg BES_VERSION
# --tag "${SNAPSHOT_IMAGE_TAG}"
# --tag "${BUILD_VERSION_TAG}"
# "${DOCKER_NAME}"
# - docker image ls -a

- stage: BUILD
name: "Build opendap/hyrax_ncwms:snapshot (RH8)"
script:
- cd "${TARGET_OS}-builds"
- export DOCKER_NAME="hyrax"
- source ./build-rh8
- export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}_ncwms:snapshot$TEST_DEPLOYMENT"
- export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}_ncwms:${HYRAX_VERSION}$TEST_DEPLOYMENT"
- export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
- show_version
- get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
- s3_get_besd_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"el8"
"${LIBDAP_VERSION}"
"${BES_VERSION}" "${ADD_DEBUG_RPMS}" 2>&1
- s3_get_olfs_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"${OLFS_VERSION}" 2>&1
- docker build
--build-arg TOMCAT_VERSION
--build-arg RELEASE_DATE
--build-arg HYRAX_VERSION
--build-arg LIBDAP_VERSION
--build-arg BES_VERSION
--build-arg OLFS_VERSION
--build-arg USE_NCWMS=true
--tag "${SNAPSHOT_IMAGE_TAG}"
--tag "${BUILD_VERSION_TAG}"
"${DOCKER_NAME}"
- docker image ls -a
# - stage: BUILD
# name: "Build opendap/hyrax_ncwms:snapshot (RH8)"
# script:
# - cd "${TARGET_OS}-builds"
# - export DOCKER_NAME="hyrax"
# - source ./build-rh8
# - export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}_ncwms:snapshot$TEST_DEPLOYMENT"
# - export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}_ncwms:${HYRAX_VERSION}$TEST_DEPLOYMENT"
# - export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
# - show_version
# - get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
# - s3_get_besd_distro
# "${S3_BUILD_BUCKET}"
# "${DOCKER_NAME}"
# "el8"
# "${LIBDAP_VERSION}"
# "${BES_VERSION}" "${ADD_DEBUG_RPMS}" 2>&1
# - s3_get_olfs_distro
# "${S3_BUILD_BUCKET}"
# "${DOCKER_NAME}"
# "${OLFS_VERSION}" 2>&1
# - docker build
# --build-arg TOMCAT_VERSION
# --build-arg RELEASE_DATE
# --build-arg HYRAX_VERSION
# --build-arg LIBDAP_VERSION
# --build-arg BES_VERSION
# --build-arg OLFS_VERSION
# --build-arg USE_NCWMS=true
# --tag "${SNAPSHOT_IMAGE_TAG}"
# --tag "${BUILD_VERSION_TAG}"
# "${DOCKER_NAME}"
# - docker image ls -a

- stage: BUILD
name: "Build opendap/hyrax:ngap-snapshot (RH8)"
script:
- cd "${TARGET_OS}-builds"
- export DOCKER_NAME="ngap"
- source ./build-rh8
- export SNAPSHOT_IMAGE_TAG="opendap/hyrax:${DOCKER_NAME}-snapshot$TEST_DEPLOYMENT"
- export BUILD_VERSION_TAG="opendap/hyrax:${DOCKER_NAME}-${HYRAX_VERSION}$TEST_DEPLOYMENT"
- export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
- show_version
- get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
- s3_get_besd_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"el8"
"${LIBDAP_VERSION}"
"${BES_VERSION}" "${ADD_DEBUG_RPMS}" 2>&1
- get_ngap_olfs_distro
"${S3_BUILD_BUCKET}"
"${DOCKER_NAME}"
"${OLFS_VERSION}" 2>&1
- docker build
--build-arg TOMCAT_VERSION
--build-arg RELEASE_DATE
--build-arg HYRAX_VERSION
--build-arg LIBDAP_VERSION
--build-arg BES_VERSION
--build-arg OLFS_VERSION
--tag "${SNAPSHOT_IMAGE_TAG}"
--tag "${BUILD_VERSION_TAG}"
"${DOCKER_NAME}"
- docker image ls -a
# - stage: BUILD
# name: "Build opendap/hyrax:ngap-snapshot (RH8)"
# script:
# - cd "${TARGET_OS}-builds"
# - export DOCKER_NAME="ngap"
# - source ./build-rh8
# - export SNAPSHOT_IMAGE_TAG="opendap/hyrax:${DOCKER_NAME}-snapshot$TEST_DEPLOYMENT"
# - export BUILD_VERSION_TAG="opendap/hyrax:${DOCKER_NAME}-${HYRAX_VERSION}$TEST_DEPLOYMENT"
# - export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
# - show_version
# - get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
# - s3_get_besd_distro
# "${S3_BUILD_BUCKET}"
# "${DOCKER_NAME}"
# "el8"
# "${LIBDAP_VERSION}"
# "${BES_VERSION}" "${ADD_DEBUG_RPMS}" 2>&1
# - get_ngap_olfs_distro
# "${S3_BUILD_BUCKET}"
# "${DOCKER_NAME}"
# "${OLFS_VERSION}" 2>&1
# - docker build
# --build-arg TOMCAT_VERSION
# --build-arg RELEASE_DATE
# --build-arg HYRAX_VERSION
# --build-arg LIBDAP_VERSION
# --build-arg BES_VERSION
# --build-arg OLFS_VERSION
# --tag "${SNAPSHOT_IMAGE_TAG}"
# --tag "${BUILD_VERSION_TAG}"
# "${DOCKER_NAME}"
# - docker image ls -a

- stage: BUILD
name: "Build opendap/olfs:snapshot"
script:
- cd "${TARGET_OS}-builds"
- export DOCKER_NAME="olfs"
- source ./build-rh8
- export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot$TEST_DEPLOYMENT"
- export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${OLFS_VERSION}$TEST_DEPLOYMENT"
- export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
- show_version
- get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
- s3_get_olfs_distro
"${S3_BUILD_BUCKET}"
"olfs"
"${OLFS_VERSION}" 2>&1
- docker build
--build-arg TOMCAT_VERSION
--build-arg RELEASE_DATE
--build-arg HYRAX_VERSION
--build-arg OLFS_VERSION
--tag "${SNAPSHOT_IMAGE_TAG}"
--tag "${BUILD_VERSION_TAG}" olfs
- docker image ls -a
# - stage: BUILD
# name: "Build opendap/olfs:snapshot"
# script:
# - cd "${TARGET_OS}-builds"
# - export DOCKER_NAME="olfs"
# - source ./build-rh8
# - export SNAPSHOT_IMAGE_TAG="opendap/${DOCKER_NAME}:snapshot$TEST_DEPLOYMENT"
# - export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${OLFS_VERSION}$TEST_DEPLOYMENT"
# - export TOMCAT_VERSION=$(get_latest_tomcat_version_number "${TOMCAT_MAJOR_VERSION}")
# - show_version
# - get_tomcat_distro "${DOCKER_NAME}" "${TOMCAT_VERSION}"
# - s3_get_olfs_distro
# "${S3_BUILD_BUCKET}"
# "olfs"
# "${OLFS_VERSION}" 2>&1
# - docker build
# --build-arg TOMCAT_VERSION
# --build-arg RELEASE_DATE
# --build-arg HYRAX_VERSION
# --build-arg OLFS_VERSION
# --tag "${SNAPSHOT_IMAGE_TAG}"
# --tag "${BUILD_VERSION_TAG}" olfs
# - docker image ls -a

- stage: TEST_DEPLOYED_IMAGE
name: "Test Deployed Image (RH8)"
script:
- source ./el8-builds/build-rh8 ./el8-build-recipe
- export TEST_IMAGE="opendap/hyrax:${HYRAX_VERSION}$TEST_DEPLOYMENT"
- echo "Running Hyrax Regression Test Script on ${TEST_IMAGE}"
- ./travis/regression_test_script -i "${TEST_IMAGE}"
- export DEPLOY_ME="false"
# - stage: TEST_DEPLOYED_IMAGE
# name: "Test Deployed Image (RH8)"
# script:
# - source ./el8-builds/build-rh8 ./el8-build-recipe
# - export TEST_IMAGE="opendap/hyrax:${HYRAX_VERSION}$TEST_DEPLOYMENT"
# - echo "Running Hyrax Regression Test Script on ${TEST_IMAGE}"
# - ./travis/regression_test_script -i "${TEST_IMAGE}"
# - export DEPLOY_ME="false"

before_deploy:
- export DOCKER_LOGIN=`aws ecr get-login --region us-east-1 | sed "s/-e none //g"`;
- $DOCKER_LOGIN;
- echo "DEPLOY_ME is ${DEPLOY_ME}"
# before_deploy:
# - export DOCKER_LOGIN=`aws ecr get-login --region us-east-1 | sed "s/-e none //g"`;
# - $DOCKER_LOGIN;
# - echo "DEPLOY_ME is ${DEPLOY_ME}"

deploy:
- provider: script
script: bash ${TRAVIS_BUILD_DIR}/travis/deploy_to_docker_hub.sh
on:
branch: master
condition: ${DEPLOY_ME} = "true"
# deploy:
# - provider: script
# script: bash ${TRAVIS_BUILD_DIR}/travis/deploy_to_docker_hub.sh
# on:
# branch: master
# condition: ${DEPLOY_ME} = "true"
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ More elaborate instructions may be found below in this document.
_Hyrax Docker Hub Pages_
- [**Hyrax Data Server**](https://cloud.docker.com/u/opendap/repository/docker/opendap/hyrax)
- [**Hyrax Data Server + ncWMS2**](https://cloud.docker.com/u/opendap/repository/docker/opendap/hyrax_ncmws)
- [**besd**](https://cloud.docker.com/u/opendap/repository/docker/opendap/olfs)
- [**olfs**](https://cloud.docker.com/u/opendap/repository/docker/opendap/besd)
- [**besd**](https://cloud.docker.com/u/opendap/repository/docker/opendap/besd)
- [**olfs**](https://cloud.docker.com/u/opendap/repository/docker/opendap/olfs)


#### Build
Expand Down
1 change: 1 addition & 0 deletions el8-builds/build-rh8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ function show_version(){
loggy " HYRAX_VERSION: ${HYRAX_VERSION}"
loggy " OLFS_VERSION: ${OLFS_VERSION}"
loggy " BES_VERSION: ${BES_VERSION}"
loggy " BES_IMAGE_TAG: ${BES_IMAGE_TAG}"
loggy " BUILD_DMRPP_VERSION: ${BUILD_DMRPP_VERSION}"
loggy " LIBDAP_VERSION: ${LIBDAP_VERSION}"
loggy " DOCKER_NAME: ${DOCKER_NAME}"
Expand Down
Loading