Skip to content

Commit

Permalink
set dependency versions for Capella 6.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chgio committed Oct 29, 2024
1 parent 8c99e20 commit 1ba4819
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
CAPELLA_VER_TEXT=$(grep CAPELLA_VER_LONG /tmp/docker-env-vars.txt)
CAPELLA_VER_LONG=${CAPELLA_VER_TEXT#CAPELLA_VER_LONG=}
CAPELLA_VER_SHORT=${CAPELLA_VER_LONG%%-[0-9A-z]*}
CAPELLA_VER_SHORT=${CAPELLA_VER_LONG%.[0-9]*}
echo "capella_ver=${CAPELLA_VER_SHORT}" >> ${GITHUB_ENV}
PY4J_VER_TEXT=$(grep PY4J_VER_LONG /tmp/docker-env-vars.txt)
PY4J_VER_LONG=${PY4J_VER_TEXT#PY4J_VER_LONG=}
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ RUN apt-get update && apt-get install -y \
RUN ln -s /usr/bin/python3 /usr/local/bin/python

# install capella
ENV CAPELLA_VER_LONG=5.2.0-R20211130-125709
ENV CAPELLA_VER_LONG=6.0.0.202209090800
ENV CAPELLA_VER_SHORT=${CAPELLA_VER_LONG%.[0-9]*}
ENV CAPELLA_TAR=https://download.eclipse.org/capella/core/products/releases/${CAPELLA_VER_LONG%.[0-9]*}/capella-${CAPELLA_VER_LONG}-linux-gtk-x86_64.tar.gz
RUN mkdir -p /opt/capella && \
cd /opt/capella && \
wget -nv -c "https://download.eclipse.org/capella/core/products/releases/5.2.0-R20211130-125709/capella-5.2.0.202111301257-linux-gtk-x86_64.tar.gz" -O capella.tar.gz && \
wget -nv -c "https://download.eclipse.org/capella/core/products/releases/${CAPELLA_VER_LONG%.[0-9]*}/capella-${CAPELLA_VER_LONG}-linux-gtk-x86_64.tar.gz" -O capella.tar.gz && \
tar -xzf capella.tar.gz && \
rm capella.tar.gz
ENV PATH="/opt/capella/capella/:${PATH}"
Expand Down Expand Up @@ -76,7 +76,7 @@ RUN mkdir -p /tmp/python4capella && \

# Install Requirements-VP
# - CapellaRequirements Feature
ENV REQVP_VER_LONG=0.12.3.202208111122
ENV REQVP_VER_LONG=0.13.1.202303011400
ENV REQVP_VER_SHORT=${REQVP_VER_LONG%.[0-9]*}
ENV REQVP_REPOSITORY=jar:https://www.eclipse.org/downloads/download.php?file=/capella/addons/requirements/updates/releases/${REQVP_VER_SHORT}/Requirements-updateSite-${REQVP_VER_LONG}.zip&r=1!
RUN capella -nosplash \
Expand Down

0 comments on commit 1ba4819

Please sign in to comment.