Merge pull request #1544 from codalab/develop

Merge develop into master

Dockerfile

@@ -13,8 +13,8 @@ RUN poetry config virtualenvs.create false
 RUN poetry config virtualenvs.in-project false
 
 COPY pyproject.toml ./
-COPY poetry.lock ./
 
+RUN poetry lock
 RUN poetry install
 
 WORKDIR /app

Dockerfile.flower

@@ -1,8 +1,12 @@
-FROM python:3.9-alpine
+FROM python:3.9
+
+# PYTHONUNBUFFERED: Force stdin, stdout and stderr to be totally unbuffered. (equivalent to `python -u`)
+# PYTHONHASHSEED: Enable hash randomization (equivalent to `python -R`)
+# PYTHONDONTWRITEBYTECODE: Do not write byte files to disk, since we maintain it as readonly. (equivalent to `python -B`)
+ENV PYTHONUNBUFFERED=1 PYTHONHASHSEED=random PYTHONDONTWRITEBYTECODE=1
 
 # Get latest root certificates
-RUN apk add --no-cache ca-certificates && update-ca-certificates curl
-RUN apk add curl
+RUN apt-get update && apt-get install -y ca-certificates && update-ca-certificates
 
 # # Install the required packages
 RUN curl -sSL https://install.python-poetry.org | python3 -
@@ -18,13 +22,6 @@ RUN poetry add redis=3.0.1
 RUN poetry add flower=0.9.3
 RUN poetry add celery="<5.0.0"
 
-# PYTHONUNBUFFERED: Force stdin, stdout and stderr to be totally unbuffered. (equivalent to `python -u`)
-# PYTHONHASHSEED: Enable hash randomization (equivalent to `python -R`)
-# PYTHONDONTWRITEBYTECODE: Do not write byte files to disk, since we maintain it as readonly. (equivalent to `python -B`)
-
-
-ENV PYTHONUNBUFFERED=1 PYTHONHASHSEED=random PYTHONDONTWRITEBYTECODE=1
-
 # Default port
 EXPOSE 5555