diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b3a3420..e38dea88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,13 +50,9 @@ jobs: test: name: test runs-on: ubuntu-latest - services: - postgres: - image: sfackler/rust-postgres-test:6 - ports: - - 5433:5433 steps: - uses: actions/checkout@v2 + - run: docker compose up -d - uses: sfackler/actions/rustup@master with: version: 1.51.0 diff --git a/docker-compose.yml b/docker-compose.yml index d44fbe86..0ed44148 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,10 @@ version: '2' services: postgres: - image: "sfackler/rust-postgres-test:6" + image: postgres:14 ports: - - 5433:5433 + - 5433:5433 + volumes: + - ./docker/sql_setup.sh:/docker-entrypoint-initdb.d/sql_setup.sh + environment: + POSTGRES_PASSWORD: postgres diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 1dd7f3db..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM postgres:12 - -COPY sql_setup.sh /docker-entrypoint-initdb.d/