From 67d794cb7557807e09523169dccc8707cdc6979e Mon Sep 17 00:00:00 2001
From: BIGAUD Nathan <nathan.bigaud@inria.fr>
Date: Mon, 15 May 2023 16:12:48 +0200
Subject: [PATCH] Simplifying to single Dockerfile
---
docker/{server_ubuntu.Dockerfile => Dockerfile} | 0
docker/client.Dockerfile | 16 ----------------
docker/server.Dockerfile | 15 ---------------
docker/server_alpine.Dockerfile | 12 ------------
4 files changed, 43 deletions(-)
rename docker/{server_ubuntu.Dockerfile => Dockerfile} (100%)
delete mode 100644 docker/client.Dockerfile
delete mode 100644 docker/server.Dockerfile
delete mode 100644 docker/server_alpine.Dockerfile
diff --git a/docker/server_ubuntu.Dockerfile b/docker/Dockerfile
similarity index 100%
rename from docker/server_ubuntu.Dockerfile
rename to docker/Dockerfile
diff --git a/docker/client.Dockerfile b/docker/client.Dockerfile
deleted file mode 100644
index 1a3334fc..00000000
--- a/docker/client.Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM python:3.9-alpine
-# Define workdir
-WORKDIR /experiment
-## Set up venv
-RUN python -m venv ~/.venvs/declearn \
- && source ~/.venvs/declearn/bin/activate
-# Install declearn
-RUN pip install declearn[all]
-# Create env variables
-ENV script client.py
-ENV client_name client_0
-ENV data_folder data
-ENV output_folder output
-
-# Run script
-CMD ["python", "${script}","${client_name}","${data_folder}","${output_folder}"]
\ No newline at end of file
diff --git a/docker/server.Dockerfile b/docker/server.Dockerfile
deleted file mode 100644
index 3ed7a616..00000000
--- a/docker/server.Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-
-FROM ubuntu:20.04
-FROM python:3.9-alpine
-# Define workdir
-WORKDIR /experiment
-# Set up venv
-ENV VIRTUAL_ENV=/opt/declearn
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-RUN apk --no-cache --update-cache add bash gcc gfortran build-base wget freetype-dev libpng-dev openblas-dev
-# Install declearn
-RUN pip install declearn[all]
-# Create env variables
-# Run script
-CMD ["bash", "experiment/run.sh"]
diff --git a/docker/server_alpine.Dockerfile b/docker/server_alpine.Dockerfile
deleted file mode 100644
index 31cfd3bb..00000000
--- a/docker/server_alpine.Dockerfile
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM python:3.9-alpine
-# Define workdir
-WORKDIR /experiment
-# Set up venv
-ENV VIRTUAL_ENV=/opt/declearn
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-RUN apk --no-cache --update-cache add bash gcc gfortran build-base wget freetype-dev libpng-dev openblas-dev
-# Install declearn
-RUN pip install declearn[all]
-# Run script
-CMD ["bash", "experiment/run.sh"]
--
GitLab