[bugfix] ujson missing dependency in director service (#1353)

* fixes ujson missing dependency

* adds target to access shell

* Fixes ujson missing dependency

* Adds shell access for manual testing

* Adds minimal testing to avoid ujson to fail again

* Moved docker test to system

* Refactor test_service_images
Uses osparc_deploy fixture

* Refined test_ujson_installation

Author: pcrespov

Makefile

@@ -126,6 +126,11 @@ $(CLIENT_WEB_OUTPUT):
 	-mkdir $(if $(IS_WIN),,-p) $(CLIENT_WEB_OUTPUT)
 
 
+.PHONY: shell
+shell:
+	docker run -it local/$(target):production /bin/sh
+
+
 ## docker SWARM -------------------------------
 #
 # - All resolved configuration are named as .stack-${name}-*.yml to distinguish from docker-compose files which can be parametrized

README.md

@@ -18,6 +18,7 @@
 [![storage]](https://microbadger.com/images/itisfoundation/storage "More on itisfoundation/storage:staging-latest image")
 -->
 
+
 <!-- ADD HERE ALL BADGE URLS -->
 [Requires.io]:https://img.shields.io/requires/github/ITISFoundation/osparc-simcore.svg
 [travis-ci]:https://travis-ci.org/ITISFoundation/osparc-simcore.svg?branch=master

services/director/Dockerfile

@@ -47,16 +47,21 @@ ENV SC_BUILD_TARGET build
 
 # Installing client libraries and any other package you need
 #
-# - client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
+#  libpq: client library for PostgreSQL https://www.postgresql.org/docs/9.5/libpq.html
+#  libstdc++: needed in ujson https://github.com/kohlschutter/junixsocket/issues/33
 #
 RUN apk update && \
     apk add --no-cache \
-      libpq
+      libpq \
+      libstdc++
+
+
+
 
 # Installing build dependencies (will be deleted in production)
 RUN apk add --virtual .build-deps \
       git \
-      gcc \
+      g++ \
       libc-dev \
       python-dev \
       musl-dev \
@@ -150,9 +155,6 @@ FROM build as development
 ENV SC_BUILD_TARGET development
 
 
-# WORKDIR /build
-# NOTE: can copy from /build if necessary
-
 WORKDIR /devel
 VOLUME  /devel/packages
 VOLUME  /devel/services/director/

services/director/Makefile

@@ -34,6 +34,10 @@ build: openapi-specs ## builds docker image (using main services/docker-compose-
 	@$(MAKE) -C ${REPO_BASE_DIR} target=${APP_NAME} $@
 
 
+.PHONY: shell
+shell: ## runs shell in production container
+	@$(MAKE) --directory ${REPO_BASE_DIR} $@ target=${APP_NAME}
+
 .PHONY: version-patch version-minor
 version-patch version-minor: ## commits version as patch (bug fixes not affecting the API), minor/minor (backwards-compatible/INcompatible API addition or changes)
 	# upgrades as $(subst version-,,$@) version, commits and tags

tests/swarm-deploy/test_service_images.py

@@ -0,0 +1,26 @@
+# pylint:disable=unused-variable
+# pylint:disable=unused-argument
+# pylint:disable=redefined-outer-name
+
+import subprocess
+from typing import Dict
+import pytest
+
+
+# search ujson in all _base.txt and add here all services that contains it
+@pytest.mark.parametrize("service", [
+    'director',
+    'webserver',
+    'storage',
+    'catalog'
+])
+def test_ujson_installation(service:str, osparc_deploy: Dict):
+    # tets failing installation undetected
+    # and fixed in PR https://github.com/ITISFoundation/osparc-simcore/pull/1353
+    image_name = osparc_deploy['simcore']['services'][service]['image']
+
+    assert subprocess.run(
+        f'docker run -t --rm {image_name} python -c "import ujson; print(ujson.__version__)"',
+        shell=True,
+        check=True,
+    )