diff --git a/infra/copycat-db/Dockerfile b/infra/copycat-db/Dockerfile index 373c6bcce0..1d492b31cf 100644 --- a/infra/copycat-db/Dockerfile +++ b/infra/copycat-db/Dockerfile @@ -3,17 +3,6 @@ FROM ubuntu:latest RUN apt-get update && apt-get install -y curl gnupg RUN apt-get install -y tini -# Install pg_dump (via Postgres client) -# https://www.postgresql.org/download/linux/ubuntu/ -# -# We don't need it for production backups, but this is useful for local testing. -RUN \ - apt-get install -y lsb-release && \ - sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' && \ - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ - apt-get update && \ - apt-get -y install postgresql-client-12 - # Install SCW CLI # Latest release: https://github.com/scaleway/scaleway-cli/releases/latest RUN \ diff --git a/infra/copycat-db/src/backup.sh b/infra/copycat-db/src/backup.sh index f197f4b0f0..1dcebf39dc 100755 --- a/infra/copycat-db/src/backup.sh +++ b/infra/copycat-db/src/backup.sh @@ -18,10 +18,9 @@ EXPIRY="$(date -Iseconds --utc --date "@$EXPIRYS")" if test -z "$SCW_RDB_INSTANCE_ID" then - # A required SCW related environment variable hasn't been specified. This is - # expected when running the script locally for testing. Fallback to using - # pg_dump for creating the backup. - pg_dump -Fc ente_db > $BACKUP_FILE + # A required SCW related environment variable hasn't been specified. + echo "Missing SCW_RDB_INSTANCE_ID" + exit 1 else # We need to export a backup first after creating it, before it can be # downloaded.