diff --git a/.circleci/config.yml b/.circleci/config.yml index 37a14de..32d9e2c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -80,12 +80,12 @@ jobs: sudo mv jq /usr/local/bin/jq - run: - name: install Postgres client v15 + name: install Postgres client v16 command: | sudo sh -c 'echo "deb https://apt.postgresql.org/pub/repos/apt jammy-pgdg main" > /etc/apt/sources.list.d/pgdg.list' wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - sudo apt-get update - sudo apt-get -y install postgresql-client-15 + sudo apt-get -y install postgresql-client-16 - run: make postgres-test - run: diff --git a/Dockerfile b/Dockerfile index 08595d5..e3668c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,7 @@ RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | \ tee /etc/apt/sources.list.d/mongodb-org-7.0.list RUN curl -sL https://deb.nodesource.com/setup_lts.x | bash - RUN apt-get -y $package_args update && \ - apt-get -y $package_args install mysql-client postgresql-client-15 mongodb-database-tools=100.9.0 mongodb-org-tools=7.0.7 mongodb-org-shell=7.0.7 redis-tools nodejs openssh-server bash vim-tiny && \ + apt-get -y $package_args install mysql-client postgresql-client-16 mongodb-database-tools=100.9.0 mongodb-org-tools=7.0.7 mongodb-org-shell=7.0.7 redis-tools nodejs openssh-server bash vim-tiny && \ apt-get clean && \ find /usr/share/doc/*/* ! -name copyright | xargs rm -rf && \ rm -rf \ diff --git a/Makefile b/Makefile index df963a3..4e0eefd 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ init: .PHONY: docker-build ## docker-build: builds docker image docker-build: clean - docker pull ubuntu:20.04 + docker pull ubuntu:22.04 docker build -t jamesclonk/${APP}:${COMMIT_SHA} $$PWD .PHONY: docker-push