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.

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

#233: Add script to generate package diffs between releases #205

Merged
merged 17 commits into from
Aug 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- [Language dependencies](flavor_base/language_deps/packages/apt_get_packages)
- Flavor packages
- [Ubuntu packages](flavor_base/flavor_base_deps/packages/apt_get_packages)
- [Python3 pip packages](flavor_base/flavor_base_deps/packages/pip3_packages)
- [Python3 pip packages](flavor_base/flavor_base_deps/packages/python3_pip_packages)
- Customization
- [Ubuntu packages](flavor_customization/packages/apt_get_packages)
- [Python3 pip packages](flavor_customization/packages/python3_pip_packages)
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
FROM {{ language_deps }}

RUN mkdir -p /build_info/packages
COPY flavor_base_deps/packages /build_info/packages/flavor_base_deps
RUN mkdir -p /build_info/packages/flavor_base_deps

RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/flavor_base_deps/apt_get_packages
COPY flavor_base_deps/packages/apt_get_packages /build_info/packages/flavor_base_deps
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/flavor_base_deps/apt_get_packages --with-versions --allow-no-version

RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flavor_base_deps/pip3_packages --python-binary python3
COPY flavor_base_deps/packages/python3_pip_packages /build_info/packages/flavor_base_deps
RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flavor_base_deps/python3_pip_packages --python-binary python3 --with-versions --allow-no-version

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
pyexasol|
keras|2.3.1
tensorflow|1.13.1
tensorflow-hub|0.4.0
kmodes|
seaborn|
matplotlib|
imbalanced-learn|
lifelines|
nltk|
gensim|
lxml|
ujson|
numpy|
scipy|1.2.1 # due to https://github.com/CamDavidsonPilon/lifelines/issues/725
scikit-learn|
pycurl|
statsmodels|
PyYAML|
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM {{udfclient_deps}}

RUN mkdir -p /build_info/packages/language_deps
COPY language_deps/packages/apt_get_packages /build_info/packages/language_deps

RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/language_deps/apt_get_packages
COPY language_deps/packages/apt_get_packages /build_info/packages/language_deps
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/language_deps/apt_get_packages --with-versions --allow-no-version

RUN /scripts/install_scripts/install_python3.6_pip.sh

COPY language_deps/packages/pip3_packages /build_info/packages/language_deps
RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/language_deps/pip3_packages --python-binary python3
COPY language_deps/packages/python3_pip_packages /build_info/packages/language_deps
RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/language_deps/python3_pip_packages --python-binary python3 --with-versions --allow-no-version

ENV PYTHON3_PREFIX /usr
ENV PYTHON3_VERSION python3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flav
# if you want to copy files or directories located in the same directory as this Dockerfile
# -----------------------------------------------------------------------------------------------------

# COPY flavor_customization/packages/pip3_packages /build_info/packages/flavor_base_deps
# COPY flavor_customization/packages/python3_pip_packages /build_info/packages/flavor_customization
# ADD flavor_customization/code.tar.gz /code

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- [Language dependencies](flavor_base/language_deps/packages/apt_get_packages)
- Flavor packages
- [Ubuntu packages](flavor_base/flavor_base_deps/packages/apt_get_packages)
- [Python3 pip packages](flavor_base/flavor_base_deps/packages/pip3_packages)
- [Python3 pip packages](flavor_base/flavor_base_deps/packages/python3_pip_packages)
- Customization
- [Ubuntu packages](flavor_customization/packages/apt_get_packages)
- [Python3 pip packages](flavor_customization/packages/python3_pip_packages)
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ def get_build_step(self) -> str:
return "udfclient_deps"

def get_additional_build_directories_mapping(self) -> Dict[str, str]:
return {"01_nodoc": "ext/01_nodoc"}
return {"01_nodoc": "ext/01_nodoc",
"scripts": "ext/scripts"}

def requires_tasks(self):
return {"cuda_deps": AnalyzeCudaDeps}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
FROM {{ language_deps }}

RUN mkdir -p /build_info/packages
COPY flavor_base_deps/packages /build_info/packages/flavor_base_deps
RUN mkdir -p /build_info/packages/flavor_base_deps

RUN apt-get -y update && \
apt-get -y install $(cat /build_info/packages/flavor_base_deps/apt_get_packages) && \
locale-gen en_US.UTF-8 && \
update-locale LC_ALL=en_US.UTF-8 && \
apt-get -y clean && \
apt-get -y autoremove && \
ldconfig
COPY flavor_base_deps/packages/apt_get_packages /build_info/packages/flavor_base_deps
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/flavor_base_deps/apt_get_packages --with-versions --allow-no-version

RUN /scripts/install_scripts/install_packages_batch.sh "PYTHON3-PIP" "pip install --ignore-installed <<list>>" "'<<package>>'" " " /build_info/packages/flavor_base_deps/pip3_packages
COPY flavor_base_deps/packages/python3_pip_packages /build_info/packages/flavor_base_deps
RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flavor_base_deps/python3_pip_packages --python-binary python3 --with-versions --allow-no-version

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
pyexasol
keras|2.3.1
tensorflow-gpu|1.13.1 # due to the dependency of tensorflow's pip package to the fixed CUDA Driver Version 410.104
tensorflow-hub|0.4.0
kmodes
seaborn
matplotlib
imbalanced-learn
lifelines
nltk
gensim
lxml
ujson
numpy
scipy|1.2.1 # due to https://github.com/CamDavidsonPilon/lifelines/issues/725
scikit-learn
pycurl
statsmodels
PyYAML
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
FROM {{udfclient_deps}}

RUN mkdir -p /build_info/packages/language_deps
COPY language_deps/packages/apt_get_packages /build_info/packages/language_deps

# ppa:deadsnakes/ppa needed for python3.6 under ubuntu:16.04
RUN apt-get update && \
apt-get -y install software-properties-common && \
add-apt-repository ppa:deadsnakes/ppa && \
apt-get -y update && \
apt-get -y install $(cat /build_info/packages/language_deps/apt_get_packages) && \
locale-gen en_US.UTF-8 && \
update-locale LC_ALL=en_US.UTF-8 && \
apt-get -y clean && \
apt-get -y autoremove && \
ldconfig
COPY language_deps/packages/apt_get_packages /build_info/packages/language_deps
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/language_deps/apt_get_packages --with-versions --allow-no-version

COPY scripts /scripts
RUN /scripts/install_scripts/install_python3.6_pip.sh

COPY scripts /scripts
COPY language_deps/packages/pip3_packages /build_info/packages/language_deps
RUN /scripts/install_scripts/install_packages_batch.sh "PYTHON3-PIP" "pip install --ignore-installed <<list>>" "<<package>>" " " /build_info/packages/language_deps/pip3_packages
COPY language_deps/packages/python3_pip_packages /build_info/packages/language_deps
RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/language_deps/python3_pip_packages --python-binary python3 --with-versions --allow-no-version

ENV PYTHON3_PREFIX /usr
ENV PYTHON3_VERSION python3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,12 @@ RUN sed --in-place --regexp-extended "s/(\/\/)(archive\.ubuntu)/\1$ARCHIVE_UBUNT

COPY 01_nodoc /etc/dpkg/dpkg.cfg.d/01_nodoc

COPY scripts /scripts

RUN mkdir -p /build_info/packages
COPY udfclient_deps/packages /build_info/packages/udfclient_deps

RUN apt-get update

RUN apt-get update && \
apt-get -y install $(cat /build_info/packages/udfclient_deps/apt_get_packages) && \
locale-gen en_US.UTF-8 && \
update-locale LC_ALL=en_US.UTF-8 && \
apt-get -y clean && \
apt-get -y autoremove && \
ldconfig
RUN /scripts/install_scripts/install_via_apt.pl --file /build_info/packages/udfclient_deps/apt_get_packages

RUN addgroup --gid 1000 exasolution
RUN adduser --disabled-login --uid 1000 --gid 1000 exasolution --gecos "First Last,RoomNumber,WorkPhone,HomePhone"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flav
# if you want to copy files or directories located in the same directory as this Dockerfile
# -----------------------------------------------------------------------------------------------------

# COPY flavor_customization/packages/pip3_packages /build_info/packages/flavor_base_deps
# COPY flavor_customization/packages/python3_pip_packages /build_info/packages/flavor_customization
# ADD flavor_customization/code.tar.gz /code

Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ RUN /scripts/install_scripts/install_via_pip.pl --file /build_info/packages/flav
# if you want to copy files or directories located in the same directory as this Dockerfile
# -----------------------------------------------------------------------------------------------------

# COPY flavor_customization/packages/pip3_packages /build_info/packages/flavor_base_deps
# COPY flavor_customization/packages/python3_pip_packages /build_info/packages/flavor_customization
# ADD flavor_customization/code.tar.gz /code

Loading