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

DO-1878 make jammy dockerfile a little bit simpler #89

Merged
merged 2 commits into from
Oct 3, 2023
Merged

DO-1878 make jammy dockerfile a little bit simpler #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
70da600
DO-1878 make jammy dockerfile a little bit simpler
balda-rdx Oct 3, 2023
34064ba
DO-1878 replicating the changes to focal
balda-rdx Oct 3, 2023
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
27 changes: 11 additions & 16 deletions node-runner-cli/Dockerfile.ubuntufocal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,26 @@ MAINTAINER radixdlt <devops@radixdlt.com>

ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update \
&& apt-get install -y --no-install-recommends make build-essential libssl-dev zlib1g-dev \
libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev ca-certificates git > /dev/null

ENV PYENV_ROOT /root/.pyenv
ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
&& apt-get install -y --no-install-recommends \
build-essential \
curl \
git \
python3-pip \
python3-dev

# Install pyenv
RUN set -ex \
&& curl https://pyenv.run | bash \
&& pyenv update

RUN CONFIGURE_OPTS=--enable-shared pyenv install 3.10.6
&& curl https://pyenv.run | bash

RUN pyenv virtualenv 3.10.6 nodecli
RUN pyenv local nodecli
RUN pip install pyinstaller==4.10 pipenv
RUN pip install pipenv

WORKDIR /app
COPY Pipfile Pipfile.lock /app/
ENV PYTHONPATH "/app/.venv/lib/python3.10/site-packages/:${PYTHONPATH}"
RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --python /root/.pyenv/shims/python
RUN PIPENV_VENV_IN_PROJECT=1 pipenv run pipenv install
RUN pipenv run pip install pyinstaller==4.10

COPY . /app
RUN pyinstaller --onefile --windowed babylonnode.spec
RUN pipenv run pyinstaller --onefile --windowed babylonnode.spec

RUN DISABLE_VERSION_CHECK=true /app/dist/babylonnode version

Expand Down
28 changes: 11 additions & 17 deletions node-runner-cli/Dockerfile.ubuntujammy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,26 @@ MAINTAINER radixdlt <devops@radixdlt.com>

ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update \
&& apt-get install -y --no-install-recommends make build-essential libssl-dev zlib1g-dev \
libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm \
libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev ca-certificates git > /dev/null

ENV PYENV_ROOT /root/.pyenv
ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
&& apt-get install -y --no-install-recommends \
build-essential \
curl \
git \
python3-pip \
python3-dev

# Install pyenv
RUN set -ex \
&& curl https://pyenv.run | bash \
&& pyenv update


RUN CONFIGURE_OPTS=--enable-shared pyenv install 3.10.6
&& curl https://pyenv.run | bash

RUN pyenv virtualenv 3.10.6 nodecli
RUN pyenv local nodecli
RUN pip install pipenv pyinstaller==4.10
RUN pip install pipenv

WORKDIR /app
COPY Pipfile Pipfile.lock /app/
ENV PYTHONPATH "/app/.venv/lib/python3.10/site-packages/:${PYTHONPATH}"
RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --python /root/.pyenv/shims/python
RUN PIPENV_VENV_IN_PROJECT=1 pipenv run pipenv install
RUN pipenv run pip install pyinstaller==4.10

COPY . /app
RUN pyinstaller --onefile --windowed babylonnode.spec
RUN pipenv run pyinstaller --onefile --windowed babylonnode.spec

RUN DISABLE_VERSION_CHECK=true /app/dist/babylonnode version

Expand Down