HYRAX-2041: Change bes installation destination to match legacy RPM installation paths#1277
HYRAX-2041: Change bes installation destination to match legacy RPM installation paths#1277hannahilea merged 19 commits intomasterfrom
Conversation
hannahilea
changed the title
$prefix to '/'
hannahilea
changed the title
| export BUILD_VERSION_TAG="opendap/${DOCKER_NAME}:${BES_VERSION}-${DIST}" | ||
| echo "Tagging image with BES version: ${BUILD_VERSION_TAG}" | ||
| docker tag ${SNAPSHOT_IMAGE_TAG} ${BUILD_VERSION_TAG} | ||
| # Uncomment the following to push a test image for a non-test-deploy pull request |
There was a problem hiding this comment.
intentionally leaving this commented out section in; i've needed to do something similar a few times recently, and it's nice to have. i don't think it's worth adding in a whole separate flag variable for it.
| fi | ||
|
|
||
| ENV USER="bes_user" | ||
| ENV BES_USER="bes_user" |
There was a problem hiding this comment.
tiny nicety while we're in here touching this code.
|
Corresponding hyrax-docker changes here: OPENDAP/hyrax-docker#142 We shouldn't merge this PR until that PR is otherwise ready to be merged immediately after. |
| --build-arg BES_BUILD_NUMBER="$BES_BUILD_NUMBER" \ | ||
| --tag "${SNAPSHOT_IMAGE_TAG}" \ | ||
| --build-context aws_downloads="$AWS_DOWNLOADS_DIR/" \ | ||
| --progress=plain $DOCKER_DEV_FLAGS \ |
There was a problem hiding this comment.
removes some extraneous logging
ndp-opendap
left a comment
ndp-opendap
left a comment
There was a problem hiding this comment.
Excellent!
Release the hounds!
Dockerfile
Outdated
| RUN echo "Sanity check: CPPFLAGS=$CPPFLAGS LDFLAGS=$LDFLAGS prefix=$PREFIX" \ | ||
| && ./configure --disable-dependency-tracking \ | ||
| --with-dependencies="${PREFIX}/deps" \ | ||
| --with-dependencies="${DEPS_PREFIX}/deps" \ |
There was a problem hiding this comment.
Using the {} decorations unambiguously identifies the env vars but is not really needed unless there is some parsing conflict with the rest of the expression. I used to use the {} decorations everywhere. But overtime I have come to think that they make things harder to read so I am slowly removing them where possible. YMMV!
This is not a change request, just me mentioning where I've been heading.
Examples
This:
--with-dependencies="${DEPS_PREFIX}/deps" \
Can be simplified to:
--with-dependencies="$DEPS_PREFIX/deps" \
But this:
--with-dependencies="${DEPS_PREFIX}my_deps" \
Cannot be simplified to:
--with-dependencies="$DEPS_PREFIXmy_deps" \
Because the parser can't disambiguate the env variable name in the last expression.
jgallagher59701
left a comment
jgallagher59701
left a comment
There was a problem hiding this comment.
I'm sure I'm missing some of the details, but it looks good. Merge.
|
|
|
3 participants
Description
Fix HYRAX-2041
Tasks
Tests added/updated