removed resources from dockerfile

Author: andre-marcos-perez

build/docker-compose.yml

@@ -27,11 +27,6 @@ services:
   spark-worker-1:
     image: spark-worker:3.0.0
     container_name: spark-worker-1
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 512m
     environment:
       - SPARK_WORKER_CORES=1
       - SPARK_WORKER_MEMORY=512m
@@ -44,11 +39,6 @@ services:
   spark-worker-2:
     image: spark-worker:3.0.0
     container_name: spark-worker-2
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 512m
     environment:
       - SPARK_WORKER_CORES=1
       - SPARK_WORKER_MEMORY=512m

build/docker/jupyterlab/Dockerfile

@@ -30,7 +30,8 @@ RUN apt-get update -y && \
 
 ARG scala_version
 
-RUN apt-get install -y ca-certificates-java --no-install-recommends && \
+RUN sed -i "s/@SPARK_VERSION@/${spark_version}/g" ${SHARED_WORKSPACE}/scala.ipynb && \
+    apt-get install -y ca-certificates-java --no-install-recommends && \
     curl -Lo coursier https://git.io/coursier-cli && \
     chmod +x coursier && \
     ./coursier launch --fork almond:${scala_kernel_version} --scala ${scala_version} -- --display-name "Scala ${scala_version}" --install && \

build/workspace/scala.ipynb

@@ -29,7 +29,7 @@
    "source": [
     "### 2.1. Get Spark\n",
     "\n",
-    "Let's start by importing Apache Spark from Maven repository (mind the Apache Spark **version**)."
+    "Let's start by importing Apache Spark from Maven repository (the **SPARK_VERSION** string is replaced on build time)."
    ]
   },
   {
@@ -49,7 +49,7 @@
     }
    ],
    "source": [
-    "import $ivy.`org.apache.spark::spark-sql:3.0.0`;"
+    "import $ivy.`org.apache.spark::spark-sql:@SPARK_VERSION@`;"
    ]
   },
   {

docker-compose.yml

@@ -27,11 +27,6 @@ services:
   spark-worker-1:
     image: andreper/spark-worker:3.0.0
     container_name: spark-worker-1
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 512m
     environment:
       - SPARK_WORKER_CORES=1
       - SPARK_WORKER_MEMORY=512m
@@ -44,11 +39,6 @@ services:
   spark-worker-2:
     image: andreper/spark-worker:3.0.0
     container_name: spark-worker-2
-    deploy:
-      resources:
-        limits:
-          cpus: '1'
-          memory: 512m
     environment:
       - SPARK_WORKER_CORES=1
       - SPARK_WORKER_MEMORY=512m