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 Dockerfile to install libopenblas-base #25

Merged
merged 3 commits into from
Dec 11, 2023
Merged

Update Dockerfile to install libopenblas-base #25

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f811893
Update Dockerfile to install libopenblas-base
sibcse Dec 8, 2023
a9d8aec
Bump service version and fix docker-compose command
elisabettai Dec 11, 2023
81310b4
Small change to trigger CI
elisabettai Dec 11, 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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 2.0.9
current_version = 2.0.10
commit = False
message = service version: {current_version} → {new_version}
tag = False
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ jobs:
- name: Build all images if multiple
uses: docker://itisfoundation/ci-service-integration-library:v1.0.3-dev-4
with:
args: docker-compose build
args: docker compose build
2 changes: 1 addition & 1 deletion .osparc/jupyter-math/metadata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description:

"
key: simcore/services/dynamic/jupyter-math
version: 2.0.9
version: 2.0.10
integration-version: 2.0.0
type: dynamic
authors:
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ USER root

RUN apt-get update && \
apt-get install -y --no-install-recommends \
libopenblas-base \
gfortran \
ffmpeg \
make \
Expand Down Expand Up @@ -95,4 +96,4 @@ RUN echo 'export PATH="/home/${NB_USER}/.venv/bin:$PATH"' >> "/home/${NB_USER}/.

EXPOSE 8888

ENTRYPOINT [ "/bin/bash", "/docker/entrypoint.bash" ]
ENTRYPOINT [ "/bin/bash", "/docker/entrypoint.bash" ]
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SHELL = /bin/sh
.DEFAULT_GOAL := help

export DOCKER_IMAGE_NAME ?= jupyter-math
export DOCKER_IMAGE_TAG ?= 2.0.9
export DOCKER_IMAGE_TAG ?= 2.0.10


# PYTHON ENVIRON ---------------------------------------------------------------------------------------
Expand Down Expand Up @@ -53,12 +53,12 @@ compose-spec: ## runs ooil to assemble the docker-compose.yml file
sh -c "cd /${DOCKER_IMAGE_NAME} && ooil compose"

build: | compose-spec ## build docker image
docker-compose build
docker compose build

# To test built service locally -------------------------------------------------------------------------
.PHONY: run-local
run-local: ## runs image with local configuration
docker-compose --file docker-compose-local.yml up
docker compose --file docker-compose-local.yml up

.PHONY: publish-local
publish-local: ## push to local throw away registry to test integration
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-local.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.7'
services:
jupyter-math:
image: simcore/services/dynamic/jupyter-math:2.0.9
image: simcore/services/dynamic/jupyter-math:2.0.10
ports:
- "8888:8888"
environment:
Expand Down