Skip to content

Commit

Permalink
Merge pull request #1353 from entando/ENG-3902-release-6.5.1
Browse files Browse the repository at this point in the history
ENG-3902 release 6.5.1 CMS fix
  • Loading branch information
cecchisandrone authored Jul 15, 2022
2 parents ff7b02e + d9ce59b commit d0e894d
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 4 deletions.
8 changes: 4 additions & 4 deletions apps/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ program.version('1.0.0')
.arguments('<app>')
.option('-p, --packageName <packageName>', 'name of the package')
.option('-d, --dev <path>', 'install app in development')
.option('-v, --version <version>', 'version of the package')
.action((app, { dev, packageName, version }) => {
.option('-x, --packageVersion <packageVersion>', 'version of the package')
.action((app, { dev, packageName, packageVersion }) => {
const appFullName = !dev ? `@entando/${app}` : app;
const appPackageName = packageName || appFullName;
Log.section(`installing ${appFullName}${version ? `@${version}` : ''}`);
Log.section(`installing ${appFullName}${packageVersion ? `@${packageVersion}` : ''}`);
if (!dev) {
execSync(`npm install --no-save ${appFullName}${version ? `@${version}` : ''}`, { stdio: [0, 1, 2] });
execSync(`npm install --no-save ${appFullName}${packageVersion ? `@${packageVersion}` : ''}`, { stdio: [0, 1, 2] });
} else {
Log.info(`installing from ${dev}`).empty(1);
execSync(`npm link --only=production ${dev}`, { stdio: [0, 1, 2] });
Expand Down
22 changes: 22 additions & 0 deletions build-and-push-docker-image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# PREPARE
set -e
export USE_MOCKS=false;
export CI=false;
export KEYCLOAK_ENABLED=true
export COMPONENT_REPOSITORY_UI_ENABLED=true;
export LEGACY_ADMINCONSOLE_INTEGRATION_ENABLED="false"
export PUBLIC_URL="/app-builder"
export DOMAIN="/entando-de-app"
VER="6.3.93-hotfix.2"

# BUILD PACKAGE
npm ci
npm rebuild node-sass
# This is needed only if you need the CMS package from a local npm registry
npm set registry http://localhost:4873
npm run app-install -- --packageVersion 0.2.252-hotfix.2 cms
npm run build --production

# BUILD AND PUSH IMAGE
docker build --platform linux/amd64 -t entando/app-builder:$VER --build-arg VERSION="$VER" . # <= don't miss the point
docker push entando/app-builder:$VER

0 comments on commit d0e894d

Please sign in to comment.