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

dependencies: update #763

Merged
merged 1 commit into from
Feb 17, 2022
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
8 changes: 4 additions & 4 deletions .github/workflows/continuous-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ jobs:
sudo sed -i 's/<policy domain="coder" rights="none" pattern="PDF" \/>/<policy domain="coder" rights="read" pattern="PDF" \/>/g' /etc/ImageMagick-6/policy.xml
- name: Setup node
uses: actions/setup-node@v1
uses: actions/setup-node@v2
with:
node-version: '12'

- name: Docker compose up
run: docker-compose up -d

- name: Setup Python 3.6
- name: Setup Python 3.9
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.9

- name: Install Poetry
uses: snok/install-poetry@v1.1.1
uses: snok/install-poetry@v1
with:
version: 1.0.10

Expand Down
11 changes: 6 additions & 5 deletions Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,16 @@
# and includes Pip, Pipenv, Node.js, NPM and some few standard libraries
# Invenio usually needs.

FROM python:3.6-slim-stretch
FROM python:3.9-slim-buster

# require debian packages
RUN apt-get upgrade -y && apt-get update -y
RUN apt-get install --no-install-recommends -y git vim-tiny curl gcc gnupg libc6-dev libxml2-dev libxmlsec1-dev libxmlsec1-openssl xpdf xpdf-utils ghostscript imagemagick && rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade setuptools wheel pip "poetry<1.1.0"
RUN apt-get install --no-install-recommends -y git vim-tiny curl gcc g++ pkg-config gnupg libc6-dev libxml2-dev libxmlsec1-dev libxmlsec1-openssl xpdf xpdf-utils ghostscript imagemagick && rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade wheel pip "poetry<1.1.0"

# # Install Node
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
RUN apt-get install --no-install-recommends -y nodejs && rm -rf /var/lib/apt/lists/*
RUN npm install --silent node-sass@4.14.1 clean-css-cli@4.3.0 uglify-js@3.9.4 requirejs@2.3.6

# Env variables
ENV WORKING_DIR=/invenio
Expand All @@ -57,5 +56,7 @@ RUN useradd invenio --uid ${INVENIO_USER_ID} --home ${WORKING_DIR} && \
chmod -R go+w ${WORKING_DIR}

# Install dependencies
RUN poetry run pip install --upgrade pip
RUN poetry run pip install --upgrade pip "setuptools<58"
RUN poetry install --no-dev


4 changes: 2 additions & 2 deletions INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ among other things.

.. code-block:: console
$ pyenv install 3.6.10
$ pyenv install 3.9.9
$ cd sonar
$ pyenv local 3.6.10
$ pyenv local 3.9.9
$ pip install poetry
Next, ``cd`` into the project directory and bootstrap the instance (this will install
Expand Down
4 changes: 2 additions & 2 deletions docker-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ services:
- "5672:5672"
es:
build: ./docker/elasticsearch/
image: elasticsearch-icu-7.10.1
image: elasticsearch-icu-7.10.2
restart: "unless-stopped"
environment:
- bootstrap.memory_lock=true
Expand All @@ -97,7 +97,7 @@ services:
volumes:
- /var/tmp
kibana:
image: docker.elastic.co/kibana/kibana-oss:7.10.1
image: docker.elastic.co/kibana/kibana-oss:7.10.2
environment:
- "ELASTICSEARCH_HOSTS=http://es:9200"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
Expand Down
2 changes: 1 addition & 1 deletion docker/elasticsearch/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.1
FROM docker.elastic.co/elasticsearch/elasticsearch-oss:7.10.2
RUN bin/elasticsearch-plugin install analysis-icu
Loading