diff --git a/dev/docker/docker-compose.yml b/dev/docker/docker-compose.yml index c572f284c0..037ed4f8ff 100644 --- a/dev/docker/docker-compose.yml +++ b/dev/docker/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: web: - image: docker.io/node:21-alpine + image: docker.io/node:21-slim container_name: firefish_web restart: unless-stopped depends_on: @@ -35,7 +35,7 @@ services: db: restart: unless-stopped - image: docker.io/groonga/pgroonga:latest-alpine-16-slim + image: docker.io/groonga/pgroonga:latest-alpine-15-slim container_name: firefish_db networks: - firefishnet diff --git a/dev/docker/docker-entrypoint.sh b/dev/docker/docker-entrypoint.sh index 4f8341853e..2a5303cb48 100755 --- a/dev/docker/docker-entrypoint.sh +++ b/dev/docker/docker-entrypoint.sh @@ -7,8 +7,8 @@ node --version if [ ! -f '/.firefish_env_initialized' ]; then # Install compilation dependencies - apk update - apk add --no-cache build-base linux-headers curl ca-certificates python3 git postgresql16-client zip unzip ffmpeg + apt-get update + DEBIAN_FRONTEND='noninteractive' apt-get install -y --no-install-recommends curl build-essential ca-certificates python3 postgresql-client-15 git curl -vvv --proto '=https' --tlsv1.2 --show-error --fail https://sh.rustup.rs | sh -s -- -y # Add Cargo PATH