Skip to content
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

ENG-XXX adds node version #74

Closed
wants to merge 1 commit into from
Closed

ENG-XXX adds node version #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .github/workflows/multi-arch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
build-args: |
ENTANDO_VERSION=${{ vars.ENTANDO_RELEASE }}
ENT_CLI_VERSION=${{ github.ref_name }}
NODE_VERSION=${{ vars.NODE_VERSION }}
labels: ${{ steps.meta-ent-cli-github.outputs.labels }}
platforms: linux/amd64

Expand All @@ -82,5 +83,6 @@ jobs:
ENTANDO_VERSION=${{ vars.ENTANDO_RELEASE }}
ENT_CLI_VERSION=${{ github.ref_name }}
KUBECTL_RELEASE=${{ vars.KUBECTL_RELEASE }}
NODE_VERSION=${{ vars.NODE_VERSION }}
labels: ${{ steps.meta-ent-cli-ocp.outputs.labels }}
platforms: linux/amd64
2 changes: 2 additions & 0 deletions Dockerfile.GitHub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ ARG ENT_CLI_VERSION
ARG ENTANDO_VERSION
ARG APP=/home/ent
ARG BUNDLE_CLI_VERSION
ARG NODE_VERSION

ENV PATH=$APP/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION/bin:$APP/.entando/bin:$PATH \
ENTANDO_ENT_HOME=$APP/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION \
BUNDLE_CLI_VERSION=$BUNDLE_CLI_VERSION \
NODE_VERSION=$NODE_VERSION \
HOME=$APP

RUN apk add --no-cache openjdk11 maven perl bash git tree jq curl grep gcompat libstdc++ docker
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile.OCP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ ARG ENTANDO_VERSION
ARG ENT_CLI_VERSION
ARG KUBECTL_RELEASE
ARG BUNDLE_CLI_VERSION
ARG NODE_VERSION

ENV BASH_ENV=/usr/local/bin/scl_enable \
ENTANDO_VERSION=$ENTANDO_VERSION \
NODE_VERSION=$NODE_VERSION \
BUNDLE_CLI_VERSION=$BUNDLE_CLI_VERSION \
PATH=$PATH:/home/ent/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION/bin:/home/ent/.entando/ent/$ENTANDO_VERSION/opt/node-v14.20.0/bin \
ENTANDO_ENT_HOME=/home/ent/.entando/ent/$ENTANDO_VERSION/cli/$ENT_CLI_VERSION \
Expand Down
16 changes: 11 additions & 5 deletions utils/activate-ent.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
set -eux

echo "BUNDLE_CLI_VERSION: $BUNDLE_CLI_VERSION"
echo "NODE_VERSION: $NODE_VERSION"

if [ -n "$BUNDLE_CLI_VERSION" ] ; then
ent check-env develop --yes --entando-bundle-cli-version="$BUNDLE_CLI_VERSION" --lenient
else
ent check-env develop --yes --lenient
fi

if [ -n "$BUNDLE_CLI_VERSION" ]; then
BUNDLE_CLI_FLAG="--entando-bundle-cli-version=$BUNDLE_CLI_VERSION"
fi

if [ -n "$NODE_VERSION" ]; then
NODE_VERSION_FLAG="--node-version=$NODE_VERSION"
fi

ent check-env develop --yes ${BUNDLE_CLI_FLAG:=} ${NODE_VERSION_FLAG:=} --lenient
Loading