Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pythontest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
# Label used to access the service container
postgres:
# Docker Hub image
image: postgres:12
image: postgres:16
# Provide the password for postgres
env:
POSTGRES_USER: learningequality
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.postgres.dev
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Installs pgvector to postgres base image.
ARG PG_MAJOR=12
ARG PG_MAJOR=16
FROM postgres:$PG_MAJOR

LABEL org.opencontainers.image.source=https://github.com/learningequality/studio
Expand Down
10 changes: 5 additions & 5 deletions docs/host_services_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Studio requires some background services to be running:
```bash
# Install packages
sudo apt-get install -y python-tk \
postgresql-server-dev-all postgresql-contrib postgresql-client postgresql-12 \
postgresql-server-dev-all postgresql-contrib postgresql-client postgresql-16 \
ffmpeg libmagickwand-dev redis-server wkhtmltopdf

# Install minio
Expand All @@ -27,10 +27,10 @@ sudo chmod +x bin/minio

### Mac OS
```bash
brew install postgresql@12 redis ffmpeg imagemagick@6 gs
brew install postgresql@16 redis ffmpeg imagemagick@6 gs
# note, this version of minio may not be compatible with Studio
brew install minio/stable/minio
brew link --force postgresql@12
brew link --force postgresql@16
brew link --force imagemagick@6
```

Expand All @@ -44,7 +44,7 @@ Make sure postgres is running:

```bash
service postgresql start
# alternatively: pg_ctl -D /usr/local/var/postgresql@12 start
# alternatively: pg_ctl -D /usr/local/var/postgresql@16 start
```

Start the client with:
Expand Down Expand Up @@ -100,7 +100,7 @@ pyenv deactivate
```

### A note about `psycopg2`
The packages `postgresql-12`, `postgresql-contrib`, and `postgresql-server-dev-all` are required to build `psycopg2` python driver.
The packages `postgresql-16`, `postgresql-contrib`, and `postgresql-server-dev-all` are required to build `psycopg2` python driver.

### A note about dependencies on Apple Silicon M1+
If you run into an error with `pip install` related to the `grcpio` package, it is because it currently [does not support M1 with the version for `grcpio` Studio uses](https://github.com/grpc/grpc/issues/25082). In order to fix it, you will need to add the following environmental variables before running `pip install`:
Expand Down
10 changes: 5 additions & 5 deletions docs/local_dev_host.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Studio requires some background services to be running:
```bash
# Install packages
sudo apt-get install -y python-tk \
postgresql-server-dev-all postgresql-contrib postgresql-client postgresql-12 \
postgresql-server-dev-all postgresql-contrib postgresql-client postgresql-16 \
ffmpeg libmagickwand-dev redis-server wkhtmltopdf

# Install minio
Expand All @@ -27,10 +27,10 @@ sudo chmod +x bin/minio

### Mac OS
```bash
brew install postgresql@12 redis ffmpeg imagemagick@6 gs
brew install postgresql@16 redis ffmpeg imagemagick@6 gs
# note, this version of minio may not be compatible with Studio
brew install minio/stable/minio
brew link --force postgresql@12
brew link --force postgresql@16
brew link --force imagemagick@6
```

Expand All @@ -44,7 +44,7 @@ Make sure postgres is running:

```bash
service postgresql start
# alternatively: pg_ctl -D /usr/local/var/postgresql@12 start
# alternatively: pg_ctl -D /usr/local/var/postgresql@16 start
```

Start the client with:
Expand Down Expand Up @@ -100,7 +100,7 @@ pyenv deactivate
```

### A note about `psycopg2`
The packages `postgresql-12`, `postgresql-contrib`, and `postgresql-server-dev-all` are required to build `psycopg2` python driver.
The packages `postgresql-16`, `postgresql-contrib`, and `postgresql-server-dev-all` are required to build `psycopg2` python driver.

### A note about dependencies on Apple Silicon M1+
If you run into an error with `pip install` related to the `grcpio` package, it is because it currently [does not support M1 with the version for `grcpio` Studio uses](https://github.com/grpc/grpc/issues/25082). In order to fix it, you will need to add the following environmental variables before running `pip install`:
Expand Down
4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
python36
python36Packages.venvShellHook
python36Packages.wheel
postgresql96 # for building psycopg2
postgresql16 # for building psycopg2
];
runTimePkgs = with npkgs; [ minio postgresql96 redis ];
runTimePkgs = with npkgs; [ minio postgresql16 redis ];
cloudPkgs = with npkgs; [
google-cloud-sdk
kubectl
Expand Down
Loading