This is an automated email from the ASF dual-hosted git repository. michaelsmolina pushed a commit to branch 5.0 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 923d076603edb6aef34b1afe26105f80d5fd2779 Author: Đỗ Trọng Hải <[email protected]> AuthorDate: Wed Feb 5 23:06:21 2025 +0700 fix(releasing): fix borked SVN-based image building process (#32151) Signed-off-by: hainenber <[email protected]> (cherry picked from commit ea5879bf2b976efb6fbe7f805f0407091fbed75a) --- RELEASING/Dockerfile.from_local_tarball | 2 +- RELEASING/Dockerfile.from_svn_tarball | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/RELEASING/Dockerfile.from_local_tarball b/RELEASING/Dockerfile.from_local_tarball index 472f5ef498..6240439050 100644 --- a/RELEASING/Dockerfile.from_local_tarball +++ b/RELEASING/Dockerfile.from_local_tarball @@ -35,7 +35,7 @@ RUN apt-get install -y build-essential libssl-dev \ # Install nodejs for custom build # https://nodejs.org/en/download/package-manager/ RUN set -eux; \ - curl -sL https://deb.nodesource.com/setup_18.x | bash -; \ + curl -sL https://deb.nodesource.com/setup_20.x | bash -; \ apt-get install -y nodejs; \ node --version; RUN if ! which npm; then apt-get install -y npm; fi diff --git a/RELEASING/Dockerfile.from_svn_tarball b/RELEASING/Dockerfile.from_svn_tarball index 22883552ca..f14754c690 100644 --- a/RELEASING/Dockerfile.from_svn_tarball +++ b/RELEASING/Dockerfile.from_svn_tarball @@ -29,13 +29,16 @@ RUN apt-get install -y apt-transport-https apt-utils # Install superset dependencies # https://superset.apache.org/docs/installation/installing-superset-from-scratch -RUN apt-get install -y build-essential libssl-dev \ - libffi-dev python3-dev libsasl2-dev libldap2-dev libxi-dev chromium +RUN apt-get install -y subversion build-essential libssl-dev \ + libffi-dev python3-dev libsasl2-dev libldap2-dev libxi-dev chromium zstd # Install nodejs for custom build # https://nodejs.org/en/download/package-manager/ -RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - \ - && apt-get install -y nodejs +RUN set -eux; \ + curl -sL https://deb.nodesource.com/setup_20.x | bash -; \ + apt-get install -y nodejs; \ + node --version; +RUN if ! which npm; then apt-get install -y npm; fi RUN mkdir -p /home/superset RUN chown superset /home/superset @@ -46,14 +49,12 @@ ARG VERSION # Can fetch source from svn or copy tarball from local mounted directory RUN svn co https://dist.apache.org/repos/dist/dev/superset/$VERSION ./ RUN tar -xvf *.tar.gz -WORKDIR apache-superset-$VERSION +WORKDIR /home/superset/apache-superset-$VERSION/superset-frontend -RUN cd superset-frontend \ - && npm ci \ +RUN npm ci \ && npm run build \ && rm -rf node_modules - WORKDIR /home/superset/apache-superset-$VERSION RUN pip install --upgrade setuptools pip \ && pip install -r requirements/base.txt \ @@ -62,6 +63,6 @@ RUN pip install --upgrade setuptools pip \ RUN flask fab babel-compile --target superset/translations ENV PATH=/home/superset/superset/bin:$PATH \ - PYTHONPATH=/home/superset/superset/:$PYTHONPATH + PYTHONPATH=/home/superset/superset/ COPY from_tarball_entrypoint.sh /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"]
