From e234cb51215a9dfc813fc072ea70c955ec1d085e Mon Sep 17 00:00:00 2001 From: Fernando Ontiveros Date: Fri, 11 Apr 2025 09:00:55 +0000 Subject: [PATCH] modifying dockerfile --- .gitlab-ci.yml | 2 +- docker/Dockerfile | 2 +- docker/build.sh | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4faa8677c..ffb276494 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: GIT_STRATEGY: fetch - GIT_FETCH_EXTRA_FLAGS: --prune --tags --depth 1000 + GIT_FETCH_EXTRA_FLAGS: --prune --tags --depth 500 stages: - build diff --git a/docker/Dockerfile b/docker/Dockerfile index 73472b4b2..6527819f5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ # Use our base image -FROM gitlab.luranasoft.com:5050/luos/docker/base-image:1.0.30-php8.3 +FROM gitlab.luranasoft.com:5050/luos/docker/base-image:1.0.33-php8.3 # Set the working directory WORKDIR /code diff --git a/docker/build.sh b/docker/build.sh index e92f2d81c..b5c5bc766 100644 --- a/docker/build.sh +++ b/docker/build.sh @@ -9,10 +9,22 @@ fi echo "Building Lurana Open Source version $1" +# Install Node.js 14 +#curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash +#export NVM_DIR="$HOME/.nvm" +#[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" +nvm use 14 + # Update and install Composer dependencies composer update composer install +echo "Building Laravel+Vue " + +node -v +npm install +npm run dev + # Construct the Docker image tag name tagname="gitlab.luranasoft.com:5050/luos/core/luos:$1" echo "Docker tag name: $tagname"