Update Dockerfile & docker-compose for faster, usable builds (#2942)

* Convert Dockerfile to multistage build

Takes advantage of layer caching for kinto admin build and python
dependency downloading

* replace psycopg2-binary with psycopg2 in `requirements.txt`

This is because kinto[postgresql] requires `psycopg2` specifically

* Nest docker-compose services in "services" key

Dockerfile

@@ -1,30 +1,37 @@
 # Mozilla Kinto server
-FROM python:3.10-slim
 
+FROM node:lts-bullseye-slim as node-builder
+COPY /kinto/plugins/admin/package.json /kinto/plugins/admin/package-lock.json ./
+RUN npm ci
+COPY /kinto/plugins/admin ./
+RUN npm run build
+
+FROM python:3.10-slim-bullseye as python-builder
+RUN python -m venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
+RUN apt-get update && apt-get install -y --no-install-recommends build-essential libpq-dev
+COPY requirements.txt .
+RUN pip install --upgrade pip && \
+    pip install -r requirements.txt && \
+    pip install kinto-attachment kinto-emailer kinto-elasticsearch kinto-portier kinto-redis httpie
+
+FROM python:3.10-slim-bullseye
+RUN apt-get update && apt-get install -y --no-install-recommends libpq-dev
 RUN groupadd --gid 10001 app && \
     useradd --uid 10001 --gid 10001 --home /app --create-home app
+
 WORKDIR /app
+COPY --from=python-builder /opt/venv /opt/venv
 COPY . /app
+COPY --from=node-builder /build ./kinto/plugins/admin/build
 
-ENV KINTO_INI /etc/kinto/kinto.ini
-ENV PORT 8888
+ENV KINTO_INI=/etc/kinto/kinto.ini \
+    PORT=8888 \
+    PATH="/opt/venv/bin:$PATH"
 
-# Install build dependencies, build the virtualenv and remove build
-# dependencies all at once to build a small image.
 RUN \
-    apt-get update && \
-    apt-get install -y g++ gcc libpq5 curl libssl-dev libffi-dev libpq-dev gnupg2 && \
-    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
-    apt-get install -y nodejs && \
-    cd kinto/plugins/admin && npm install && npm run build && \
-    pip3 install --upgrade pip && \
-    pip3 install -e /app[postgresql,memcached,monitoring] -c /app/requirements.txt && \
-    pip3 install kinto-attachment kinto-emailer kinto-elasticsearch kinto-portier kinto-redis && \
-    pip3 install httpie && \
-    kinto init --ini $KINTO_INI --host 0.0.0.0 --backend=memory --cache-backend=memory && \
-    apt-get purge -y -qq g++ gcc libssl-dev libffi-dev libpq-dev curl nodejs && \
-    apt-get autoremove -y -qq && \
-    apt-get clean -y
+    pip install -e /app[postgresql,memcached,monitoring] -c /app/requirements.txt && \
+    kinto init --ini $KINTO_INI --host 0.0.0.0 --backend=memory --cache-backend=memory
 
 USER app
 # Run database migrations and start the kinto server

docker-compose.yml

@@ -1,21 +1,27 @@
-db:
-  image: postgres
-  environment:
-    POSTGRES_USER: postgres
-    POSTGRES_PASSWORD: postgres
-cache:
-  image: library/memcached
-web:
-  image: kinto/kinto-server
-  links:
-   - db
-   - cache
-  ports:
-   - "8888:8888"
-  environment:
-    KINTO_CACHE_BACKEND: kinto.core.cache.memcached
-    KINTO_CACHE_HOSTS: cache:11211 cache:11212
-    KINTO_STORAGE_BACKEND: kinto.core.storage.postgresql
-    KINTO_STORAGE_URL: postgresql://postgres:postgres@db/postgres
-    KINTO_PERMISSION_BACKEND: kinto.core.permission.postgresql
-    KINTO_PERMISSION_URL: postgresql://postgres:postgres@db/postgres
+version: "3"
+services:
+  db:
+    image: postgres:14
+    environment:
+      POSTGRES_NAME: postgres
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+  cache:
+    image: memcached:1
+  web:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    image: kinto/kinto-server:latest
+    depends_on:
+    - db
+    - cache
+    ports:
+    - "8888:8888"
+    environment:
+      KINTO_CACHE_BACKEND: kinto.core.cache.memcached
+      KINTO_CACHE_HOSTS: cache:11211 cache:11212
+      KINTO_STORAGE_BACKEND: kinto.core.storage.postgresql
+      KINTO_STORAGE_URL: postgresql://postgres:postgres@db/postgres
+      KINTO_PERMISSION_BACKEND: kinto.core.permission.postgresql
+      KINTO_PERMISSION_URL: postgresql://postgres:postgres@db/postgres

requirements.txt

@@ -7,7 +7,7 @@ jsonpatch==1.32
 jsonschema==4.4.0
 logging-color-formatter==1.0.2
 newrelic==7.2.4.171
-psycopg2-binary==2.9.3
+psycopg2==2.9.3
 pyramid==2.0
 pyramid-mailer==0.15.1
 pyramid-multiauth==1.0.1