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

Update base image to Debian 12 #457

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Update base image to Debian 12 #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
03db6c5
Changes to prepare for debian-12 base image and toolchain v5
MarkoBarisic Mar 28, 2024
17894a0
Fix dependecies
MarkoBarisic Mar 29, 2024
3ca658e
Remove versions from requirement files
MarkoBarisic Mar 29, 2024
efadf6a
Bump memgraph version
MarkoBarisic Mar 29, 2024
0543464
Fix fi typo
MarkoBarisic Mar 29, 2024
f9455c4
Bump memgraph version in test.yml
MarkoBarisic Mar 29, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/docker_publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ jobs:

- name: Download memgraph binary
run: |
curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.memgraph_version }}/debian-11/memgraph_${{ github.event.inputs.memgraph_version }}-1_amd64.deb > memgraph-amd64.deb
curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.memgraph_version }}/debian-11-aarch64/memgraph_${{ github.event.inputs.memgraph_version }}-1_arm64.deb > memgraph-arm64.deb
curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.memgraph_version }}/debian-12/memgraph_${{ github.event.inputs.memgraph_version }}-1_amd64.deb > memgraph-amd64.deb
curl -L https://download.memgraph.com/memgraph/v${{ github.event.inputs.memgraph_version }}/debian-12-aarch64/memgraph_${{ github.event.inputs.memgraph_version }}-1_arm64.deb > memgraph-arm64.deb

- name: Build & push prod docker images
run: |
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and Test

env:
PY_VERSION: "3.9"
PY_VERSION: "3.11"
CORE_COUNT: "8"
MAGE_CONTAINER: "mage"
MEMGRAPH_PORT: 7687
Expand All @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: True
env:
MEMGRAPH_VERSION: 2.14.1
MEMGRAPH_VERSION: 2.15.1
strategy:
matrix:
architecture: ["amd64", "arm64"]
Expand All @@ -39,14 +39,18 @@ jobs:
- name: Download memgraph binaries
run: |
if [ "${{ env.OFFICIAL }}" = "true" ]; then
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-11/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb" > memgraph-amd64.deb
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-11-aarch64/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb" > memgraph-arm64.deb
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-12/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb" > memgraph-amd64.deb
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-12-aarch64/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb" > memgraph-arm64.deb
else
sudo apt update && sudo apt install -y ca-certificates wget git
wget -q https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb -O memgraph-amd64.deb
wget -q https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb -O memgraph-arm64.deb

wget -q \
https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/v${MEMGRAPH_VERSION}/debian-12/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb \
-O memgraph-amd64.deb
wget -q \
https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/v${MEMGRAPH_VERSION}/debian-12-aarch64/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb \
-O memgraph-arm64.deb
fi

- name: Disk status before cleaning
run: |
df -h
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/test_no_ml.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: Build and Test no

env:
PY_VERSION: "3.9"
PY_VERSION: "3.11"
CORE_COUNT: "8"
MAGE_CONTAINER: "mage"
MEMGRAPH_PORT: 7687
Expand All @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: True
env:
MEMGRAPH_VERSION: 2.14.1
MEMGRAPH_VERSION: 2.15.1
strategy:
matrix:
architecture: ["amd64", "arm64"]
Expand All @@ -39,14 +39,18 @@ jobs:
- name: Download memgraph binaries
run: |
if [ "${{ env.OFFICIAL }}" = "true" ]; then
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-11/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb" > memgraph-amd64.deb
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-11-aarch64/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb" > memgraph-arm64.deb
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-12/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb" > memgraph-amd64.deb
curl -L "https://download.memgraph.com/memgraph/v${MEMGRAPH_VERSION}/debian-12-aarch64/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb" > memgraph-arm64.deb
else
sudo apt update && sudo apt install -y ca-certificates wget git
wget -q https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb -O memgraph-amd64.deb
wget -q https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb -O memgraph-arm64.deb

wget -q \
https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/v${MEMGRAPH_VERSION}/debian-12/memgraph_${MEMGRAPH_VERSION}-1_amd64.deb \
-O memgraph-amd64.deb
wget -q \
https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/memgraph-unofficial/v${MEMGRAPH_VERSION}/debian-12-aarch64/memgraph_${MEMGRAPH_VERSION}-1_arm64.deb \
-O memgraph-arm64.deb
fi

- name: Disk status before cleaning
run: |
df -h
Expand Down
13 changes: 7 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PY_VERSION_DEFAULT=3.9
ARG PY_VERSION_DEFAULT=3.11

FROM debian:bullseye as base
FROM debian:bookworm as base

USER root

Expand All @@ -13,6 +13,7 @@ ENV PY_VERSION ${PY_VERSION_DEFAULT}
RUN apt-get update && apt-get install -y \
libcurl4 `memgraph` \
libpython${PY_VERSION} `memgraph` \
libssl3 `memgraph` \
libssl-dev `memgraph` \
openssl `memgraph` \
build-essential `mage-memgraph` \
Expand All @@ -30,7 +31,7 @@ RUN apt-get update && apt-get install -y \
libboost-all-dev `mage-memgraph` \
--no-install-recommends \
# Download and install Memgraph
&& curl https://download.memgraph.com/memgraph/v${MG_VERSION}/debian-11/memgraph_${MG_VERSION}-1_amd64.deb --output memgraph.deb \
&& curl https://download.memgraph.com/memgraph/v${MG_VERSION}/debian-12/memgraph_${MG_VERSION}-1_amd64.deb --output memgraph.deb \
&& dpkg -i memgraph.deb \
&& rm memgraph.deb \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
Expand All @@ -48,9 +49,9 @@ COPY . /mage
#MAGE
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& export PATH="/root/.cargo/bin:${PATH}" \
&& python3 -m pip install -r /mage/python/requirements.txt \
&& python3 -m pip install -r /mage/python/tests/requirements.txt \
&& python3 -m pip install torch-sparse torch-cluster torch-spline-conv torch-geometric torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cu102.html\
&& python3 -m pip install --break-system-packages -r /mage/python/requirements.txt \
&& python3 -m pip install --break-system-packages -r /mage/python/tests/requirements.txt \
&& python3 -m pip install --break-system-packages torch-sparse torch-cluster torch-spline-conv torch-geometric torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cu102.html\
&& python3 /mage/setup build -p /usr/lib/memgraph/query_modules/

#DGL build from source
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile.no_ML
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PY_VERSION_DEFAULT=3.9
ARG PY_VERSION_DEFAULT=3.11

FROM debian:bullseye as base
FROM debian:bookworm as base

USER root

Expand All @@ -12,6 +12,7 @@ ENV PY_VERSION ${PY_VERSION_DEFAULT}
RUN apt-get update && apt-get install -y \
libcurl4 `memgraph` \
libpython${PY_VERSION} `memgraph` \
libssl3 `memgraph` \
libssl-dev `memgraph` \
openssl `memgraph` \
build-essential `mage-memgraph` \
Expand Down Expand Up @@ -47,8 +48,8 @@ COPY . /mage
#MAGE
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& export PATH="/root/.cargo/bin:${PATH}" \
&& python3 -m pip install -r /mage/python/tests/requirements.txt \
&& python3 -m pip install -r /mage/python/requirements_no_ml.txt \
&& python3 -m pip install --break-system-packages -r /mage/python/tests/requirements.txt \
&& python3 -m pip install --break-system-packages -r /mage/python/requirements_no_ml.txt \
&& python3 /mage/setup build -p /usr/lib/memgraph/query_modules/ --no-ml \
&& chown -R memgraph: /mage/e2e

Expand Down
11 changes: 6 additions & 5 deletions Dockerfile.release
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG PY_VERSION_DEFAULT=3.9
ARG PY_VERSION_DEFAULT=3.11

FROM debian:bullseye as base
FROM debian:bookworm as base

USER root

Expand All @@ -12,6 +12,7 @@ ENV PY_VERSION ${PY_VERSION_DEFAULT}
RUN apt-get update && apt-get install -y \
libcurl4 `memgraph` \
libpython${PY_VERSION} `memgraph` \
libssl3 `memgraph` \
libssl-dev `memgraph` \
openssl `memgraph` \
build-essential `mage-memgraph` \
Expand Down Expand Up @@ -49,9 +50,9 @@ COPY . /mage
#MAGE
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y \
&& export PATH="/root/.cargo/bin:${PATH}" \
&& python3 -m pip install -r /mage/python/requirements.txt \
&& python3 -m pip install -r /mage/python/tests/requirements.txt \
&& python3 -m pip install torch-sparse torch-cluster torch-spline-conv torch-geometric torch-scatter -f https://data.pyg.org/whl/torch-1.12.0+cu102.html \
&& python3 -m pip install --break-system-packages -r /mage/python/requirements.txt \
&& python3 -m pip install --break-system-packages -r /mage/python/tests/requirements.txt \
&& python3 -m pip install --break-system-packages torch-sparse torch-cluster torch-spline-conv torch-geometric torch-scatter -f https://data.pyg.org/whl/torch-1.13.0+cu102.html \
&& python3 /mage/setup build -p /usr/lib/memgraph/query_modules/ \
&& chown -R memgraph: /mage/e2e

Expand Down
30 changes: 15 additions & 15 deletions python/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
gekko==0.2.8
networkx==2.6.2
python-Levenshtein==0.12.1
elasticsearch==8.4.3
gensim==4.0.0
torch==1.12.0
six==1.16.0
torchmetrics==0.9.3
igraph==0.10.2
scikit-learn==0.24.2
gqlalchemy==1.4.1
mysql-connector-python==8.0.32
oracledb==1.2.2
pyodbc==4.0.35
defusedxml==0.7.1
gekko
networkx
python-Levenshtein
elasticsearch
gensim
torch
six
torchmetrics
igraph
scikit-learn
gqlalchemy
mysql-connector-python
oracledb
pyodbc
defusedxml
26 changes: 13 additions & 13 deletions python/requirements_no_ml.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
gekko==0.2.8
networkx==2.6.2
python-Levenshtein==0.12.1
elasticsearch==8.4.3
gensim==4.0.0
six==1.16.0
igraph==0.10.2
scikit-learn==0.24.2
gqlalchemy==1.4.1
mysql-connector-python==8.0.32
oracledb==1.2.2
pyodbc==4.0.35
defusedxml==0.7.1
gekko
networkx
python-Levenshtein
elasticsearch
gensim
six
igraph
scikit-learn
gqlalchemy
mysql-connector-python
oracledb
pyodbc
defusedxml
24 changes: 12 additions & 12 deletions python/tests/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
pytest==7.0
PyYAML==5.4.1
black==22.3.0
flake8==3.9.2
pymgclient==1.3.1
pytest-pylint==0.21.0
pytest-timeout==1.4.2
pytest-cov==2.12.1
pytest-benchmark==3.4.1
pytest-flake8==1.0.7
pytest-black==0.3.12
gqlalchemy==1.4.1
pytest
PyYAML
black
flake8
pymgclient
pytest-pylint
pytest-timeout
pytest-cov
pytest-benchmark
pytest-flake8
pytest-black
gqlalchemy
Loading